From 16ec7f34dae3608da1a37f2ce7504d85bf62b52e Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Tue, 4 Jun 2024 15:02:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E6=89=93=E5=9B=9E=E7=8A=B6=E6=80=81=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AftersalesReturnRecordController.java          |  2 +-
 .../impl/AftersalesReturnRecordServiceImpl.java    |  7 ++++++-
 .../impl/AftersalesWorkOrderServiceImpl.java       | 14 +++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReturnRecordController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReturnRecordController.java
index 188ea2222..93ada89ea 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReturnRecordController.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesReturnRecordController.java
@@ -137,7 +137,7 @@ public class AftersalesReturnRecordController extends BladeController {
 		if(aftersalesReturnRecord.getProcessorList().isEmpty()){
 			return R.fail("请选择打回的营业部！");
 		}
-		aftersalesReturnRecord.setTypesOf(ReturnRecordTypesOfStatusConstant.yibandahui.getValue());
+//		aftersalesReturnRecord.setTypesOf(ReturnRecordTypesOfStatusConstant.yibandahui.getValue());
 		return R.status(aftersalesReturnRecordService.batchRepulse(aftersalesReturnRecord));
 	}
 
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesReturnRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesReturnRecordServiceImpl.java
index 68804a1da..803f7658e 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesReturnRecordServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesReturnRecordServiceImpl.java
@@ -31,6 +31,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.common.constant.aftersales.ProcessorConditionsStatusConstant;
 import org.springblade.common.constant.aftersales.ProcessorProcessingStatusStatusConstant;
 import org.springblade.common.constant.aftersales.ProcessorTypesOfStatusConstant;
+import org.springblade.common.constant.aftersales.ReturnRecordTypesOfStatusConstant;
 import org.springblade.common.constant.aftersales.WorkOrderStatusConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
@@ -180,7 +181,11 @@ public class AftersalesReturnRecordServiceImpl extends BaseServiceImpl<Aftersale
 				//修改异常工单的状态
 				AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderVO();
 				workOrderEntity.setId(i);
-				workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.daichuli.getValue());
+				if(ObjectUtil.equal(aftersalesReturnRecord.getTypesOf(), ReturnRecordTypesOfStatusConstant.yibandahui.getValue())){
+					workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.lipeijineweichu.getValue());
+				}else if(ObjectUtil.equal(aftersalesReturnRecord.getTypesOf(), ReturnRecordTypesOfStatusConstant.wanjeidahui.getValue())){
+					workOrderEntity.setWorkOrderStatus(WorkOrderStatusConstant.yichuli.getValue());
+				}
 				aftersalesWorkOrderService.updateById(workOrderEntity);
 				AftersalesReturnRecordEntity returnRecordEntity = new AftersalesReturnRecordEntity();
 				BeanUtil.copyProperties(aftersalesReturnRecord,returnRecordEntity);
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 ce6fd7a07..9f3378806 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
@@ -1750,14 +1750,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);
-		}
+//		if (ObjectUtils.isNotNull(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();