From 92ec1cd8d0c497fec219ebe8aebe3b4cb3e052e0 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Sat, 16 Dec 2023 00:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=94=E6=AC=BE=E6=96=B9?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AftersalesCompletionRecipientEntity.java        | 2 +-
 .../entity/AftersalesCompletionRecordEntity.java           | 2 +-
 .../logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml  | 2 +-
 .../service/impl/AftersalesWorkOrderServiceImpl.java       | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecipientEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecipientEntity.java
index 63657c652..a84df144e 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecipientEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecipientEntity.java
@@ -100,6 +100,6 @@ public class AftersalesCompletionRecipientEntity extends TenantEntity {
 	 * 说明
 	 */
 	@ApiModelProperty(value = "说明")
-	private String explain;
+	private String explains;
 
 }
diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java
index 7cda149b7..cef286955 100644
--- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java
+++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java
@@ -76,7 +76,7 @@ public class AftersalesCompletionRecordEntity extends TenantEntity {
 	 * 说明
 	 */
 	@ApiModelProperty(value = "说明")
-	private String explain;
+	private String explains;
 	/**
 	 * 财务是否处理 1是 2 否
 	 */
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 5285bcf11..363539d60 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -156,7 +156,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d
         las.work_order_status workOrderStatus
           from logpm_aftersales_settlement   las
         <where>
-            lap.processing_status = '4' and lap.is_deleted = 0
+            las.processing_status = '4' and las.is_deleted = 0
             <if test="param.businessId != null  "> and las.business_id = #{param.businessId }</if>
             <if test="param.businessName != null and param.businessName != '' "> and las.business_name = #{param.businessName }</if>
             <if test="param.workOrderNumber != null and param.workOrderNumber != '' "> and las.work_order_number = #{param.workOrderNumber }</if>
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 d0af14938..766730e20 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
@@ -389,6 +389,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			if(ObjectUtils.isNull(v.getCompletionRecordEntities()) ){
 				throw new ServiceException("赔款方数据不能为空");
 			}
+			AftersalesWorkOrderEntity workOrderEntity1 = baseMapper.selectById(v.getId());
+			if(workOrderEntity1.getWorkOrderStatus().equals(WorkOrderStatusConstant.yiwanjei.getValue())){
+				throw new ServiceException(" 包含已完结的异常工单！");
+			}
 			//添加赔付方信息
 			completionRecordService.saveBatch(v.getCompletionRecordEntities());
 			//添加受款方信息，可以为空
@@ -1003,6 +1007,9 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			if(byId.getWorkOrderStatus().equals(WorkOrderStatusConstant.yichuli.getValue())){
 				throw new ServiceException("当前异常工单已处理！");
 			}
+			if(byId.getWorkOrderStatus().equals(WorkOrderStatusConstant.yiwanjei.getValue())){
+				throw new ServiceException("当前异常工单已完结！！");
+			}
 			AftersalesProcessingResultsDTO aftersalesProcessingResultsDTO = aftersalesWorkOrder.getAftersalesProcessingResultsDTO();
 			aftersalesProcessingResultsService.ownSaveOrUpdate(aftersalesProcessingResultsDTO);
 			//添加完结数据