From fbbffe8d1668b6534582a1ce2f1212645a04feaf Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Wed, 29 May 2024 18:04:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=A7=A3=E5=86=B3=E5=94=AE?=
 =?UTF-8?q?=E5=90=8E=E5=BC=82=E5=B8=B8=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AftersalesWorkOrderServiceImpl.java  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

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 a8176a2d5..ce6fd7a07 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
@@ -2008,7 +2008,10 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				throw new ServiceException("已处理！");
 			}
 		}
-
+		LambdaUpdateWrapper<AftersalesCompletionRecordEntity> completionRecordEntityLambdaUpdateWrapper = Wrappers.<AftersalesCompletionRecordEntity>lambdaUpdate()
+			.set(AftersalesCompletionRecordEntity::getIsDeleted, 1)
+			.eq(AftersalesCompletionRecordEntity::getWorkOrderId, aftersalesWorkOrder.getId());
+		completionRecordService.update(completionRecordEntityLambdaUpdateWrapper);
 		//异常工单完结处理结果赔款方
 		if (!aftersalesWorkOrder.getCompletionRecordEntities().isEmpty()) {
 			aftersalesWorkOrder.getCompletionRecordEntities().forEach(r -> {
@@ -2021,11 +2024,12 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 //			if (ObjectUtils.isNotNull(aftersalesWorkOrder.getAssignListRecord())) {
 //				completionRecordService.deleteLogic(aftersalesWorkOrder.getAssignListRecord());
 //			}
-			LambdaUpdateWrapper<AftersalesCompletionRecordEntity> completionRecipientEntityLambdaUpdateWrapper = Wrappers.<AftersalesCompletionRecordEntity>lambdaUpdate()
-				.set(AftersalesCompletionRecordEntity::getIsDeleted, 1)
-				.eq(AftersalesCompletionRecordEntity::getWorkOrderId, aftersalesWorkOrder.getId());
-			completionRecordService.update(completionRecipientEntityLambdaUpdateWrapper);
+
 		}
+		LambdaUpdateWrapper<AftersalesCompletionRecipientEntity> completionRecipientEntityLambdaUpdateWrapper = Wrappers.<AftersalesCompletionRecipientEntity>lambdaUpdate()
+			.set(AftersalesCompletionRecipientEntity::getIsDeleted, 1)
+			.eq(AftersalesCompletionRecipientEntity::getWorkOrderId, aftersalesWorkOrder.getId());
+		completionRecipientService.update(completionRecipientEntityLambdaUpdateWrapper);
 		//异常工单完结处理结果受款方
 		if (!aftersalesWorkOrder.getCompletionRecipientEntities().isEmpty()) {
 			aftersalesWorkOrder.getCompletionRecipientEntities().forEach(r -> {
@@ -2041,10 +2045,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 //				//删除
 //				completionRecipientService.deleteLogic(aftersalesWorkOrder.getAssignListRecipient());
 //			}
-			LambdaUpdateWrapper<AftersalesCompletionRecipientEntity> completionRecipientEntityLambdaUpdateWrapper = Wrappers.<AftersalesCompletionRecipientEntity>lambdaUpdate()
-				.set(AftersalesCompletionRecipientEntity::getIsDeleted, 1)
-				.eq(AftersalesCompletionRecipientEntity::getWorkOrderId, aftersalesWorkOrder.getId());
-			completionRecipientService.update(completionRecipientEntityLambdaUpdateWrapper);
+
 
 		}
 		AftersalesWorkOrderEntity workOrderEntity = new AftersalesWorkOrderEntity();