From 8331dcdfbf36ff0874aa4f3b7e7dfb5137042f22 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Tue, 26 Dec 2023 15:49:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=8F=AF=E4=BB=A5=E8=BF=BD=E5=8A=A0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AftersalesWorkOrderController.java        |  3 --
 .../impl/AftersalesWorkOrderServiceImpl.java  | 28 +++++++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
index d9e5b97fd..9b0c1ca47 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java
@@ -198,9 +198,6 @@ public class AftersalesWorkOrderController extends BladeController {
 		if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getId())){
 			throw new ServiceException("异常工单ID不能为空");
 		}
-		if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getProcessorEntityList())){
-			throw new ServiceException("处理方信息不能为空");
-		}
 
 		return R.status(aftersalesWorkOrderService.savaSurveyRecord(aftersalesWorkOrderDTO));
 	}
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index f73fc20b1..9269e6c4a 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -305,9 +305,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 					list.add(processor);
 				}
 				aftersalesProcessorService.save(processor);
-				AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrder, processor, aftersaleSurveyRecord);
-				//添加待回复信息
-				aftersalesReplyingPartyService.save(replyingPartyEntity);
+				if(ProcessorTypesOfStatusConstant.chulifang.getValue().equals(i.getTypesOf())){
+					AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrder, processor, aftersaleSurveyRecord);
+					//添加待回复信息
+					aftersalesReplyingPartyService.save(replyingPartyEntity);
+				}
 			});
 
 		}
@@ -1176,20 +1178,26 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		AftersaleSurveyRecordDTO surveyRecordDTO = aftersalesWorkOrderDTO.getSurveyRecordDTO();
 		AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
 		BeanUtil.copyProperties(surveyRecordDTO,surveyRecordEntity);
-//		surveyRecordEntity.setProcessorId(processor1.getId());
+		if(one.isPresent()){
+			surveyRecordEntity.setProcessorId(one.get().getId());
+		}
 		surveyRecordEntity.setDifference("1");
+		surveyRecordEntity.setAddPeople(user.getUserName());
+		surveyRecordEntity.setAddDepartment(myCurrentWarehouse.getName());
 		aftersaleSurveyRecordService.save(surveyRecordEntity);
-
 		//是否处理
 		if(!one.isPresent()){
-			AftersalesProcessorEntity processor1 = one.get();
+
 			//不是处理方
 			if(aftersalesWorkOrderDTO.getProcessorEntityList().isEmpty()){
 				//没有 全部
 				List<AftersalesProcessorEntity> collect = list.stream().filter(i -> "1".equals(i.getProcessingStatus())).collect(Collectors.toList());
 				//添加待回复信息
 				collect.forEach( i ->{
-					getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordDTO);
+
+					AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordEntity);
+					//添加待回复信息
+					aftersalesReplyingPartyService.save(replyingPartyEntity);
 				});
 
 			}else{
@@ -1207,6 +1215,8 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			updateWrapper.eq("processor_id",processor1.getId());
 			updateWrapper.eq("difference","1");
 			updateWrapper.set("difference","2");
+			updateWrapper.set("processed_by_id",user.getUserId());
+			updateWrapper.set("processed_by_name",user.getUserName());
 			aftersalesReplyingPartyService.update(updateWrapper);
 
 			//添加或修改新的处理方
@@ -1242,7 +1252,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			//添加指定处理结果
 			//处理方
 			addSurveRecord(aftersalesWorkOrderDTO, user, i);
-			getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordDTO);
+			AftersalesReplyingPartyEntity replyingPartyEntity = getPartyEntity(aftersalesWorkOrderDTO,i,surveyRecordDTO);
+			//添加待回复信息
+			aftersalesReplyingPartyService.save(replyingPartyEntity);
 		});
 	}