修改工单添加

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java

@@ -89,7 +89,7 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<Afters
 				if(!byClientIdList.isEmpty()){
 					StringBuffer stringBu = new StringBuffer();
 					byClientIdList.forEach(a ->{
-						String value = DictBizCache.getValue( DictBizConstant.DISTRIBUTION_TYPE,a.getTypeService());
+						String value = DictBizCache.getValue( DictBizConstant.BASIC_FREIGHT_TYPE,a.getTypeService());
 						stringBu.append(value);
 					});
 					i.setTypeServiceName(stringBu.toString());

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -394,7 +394,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 //			completionRecordService.saveBatch(aftersalesWorkOrder.getCompletionRecordEntities());
 		}
 		//添加处理结果
-		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getAftersalesProcessingResultsDTO())){
+		if(ObjectUtils.isNotNull(aftersalesWorkOrder.getAftersalesProcessingResultsDTO()) && ObjectUtils.isNotNull( aftersalesWorkOrder.getAftersalesProcessingResultsDTO().getCompensationMethod() ) ){
 			addProcessingResults(aftersalesWorkOrder);
 		}
 			return  true;
@@ -1323,6 +1323,14 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		}
 		//添加处理结果
 		AftersalesProcessingResultsDTO aftersalesProcessingResultsDTO = aftersalesWorkOrderDTO.getAftersalesProcessingResultsDTO();
+		if(ObjectUtils.isNotNull(aftersalesWorkOrderDTO.getId())){
+			aftersalesProcessingResultsDTO.setWorkOrderId(aftersalesWorkOrderDTO.getId());
+			aftersalesProcessingResultsDTO.setCreateUser(user.getUserId());
+			aftersalesProcessingResultsDTO.setCreateDept(Long.valueOf(user.getDeptId()));
+			aftersalesProcessingResultsDTO.setCreateTime(new Date());
+			aftersalesProcessingResultsDTO.setStatus(1);
+			aftersalesProcessingResultsDTO.setIsDeleted(0);
+		}
 		aftersalesProcessingResultsService.ownSaveOrUpdate(aftersalesProcessingResultsDTO);
 		//修改异常工单处理信息！
 		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();