From 6092d45424d20f88909df3051f9e9676e13383ac Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Mon, 27 Mar 2023 14:16:50 +0800
Subject: [PATCH] =?UTF-8?q?67076=20studio=E6=92=A4=E5=9B=9E=E3=80=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=87=8D=E7=BD=AE=EF=BC=8C=E5=B0=86=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=B7=A5=E7=A8=8B=E5=B8=88=E7=9A=84=E5=BE=85=E5=8A=9E?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BB=BB=E5=8A=A1=E8=BD=AC=E4=B8=BA=E5=B7=B2?=
 =?UTF-8?q?=E5=8A=9E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ctCertificationInventoryEOServiceImpl.java | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
index df309f54b..cb123e9e3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
@@ -2070,6 +2070,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		String itemName = (String) standNameAndItemName.get("itemName");
 
 		try {
+			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
+				// 把交付结果、截止日期清空，流程状态 设置为 清单待发布
+				LambdaUpdateWrapper<ProjectCertificationInventoryEO> updateWrap = new LambdaUpdateWrapper<>();
+				updateWrap.set(ProjectCertificationInventoryEO::getDeliveryResult,null);
+
+				// 流程重置，清空截止日期， 撤回不清空。 对应禅道问题：67048
+				if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
+					updateWrap.set(ProjectCertificationInventoryEO::getEndTime,null);
+				}
+
+				updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
+				updateWrap.eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
+				this.update(updateWrap);
+			}
+
 	// 处理待办中心相关数据
 		// 更新该项目认证流程中，认证工程师的任务状态。
 			// 认证工程师接受任务节点
@@ -2090,21 +2105,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
 			this.processInfoDetailEOService.remove(detailRemoveWrap);
 
-			for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
-				// 把交付结果、截止日期清空，流程状态 设置为 清单待发布
-				LambdaUpdateWrapper<ProjectCertificationInventoryEO> updateWrap = new LambdaUpdateWrapper<>();
-				updateWrap.set(ProjectCertificationInventoryEO::getDeliveryResult,null);
-
-				// 流程重置，清空截止日期， 撤回不清空。 对应禅道问题：67048
-				if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
-					updateWrap.set(ProjectCertificationInventoryEO::getEndTime,null);
-				}
-
-				updateWrap.set(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
-				updateWrap.eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
-				this.update(updateWrap);
-			}
-
 			try {
 				List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
 				if(CollectionUtils.isNotEmpty(certificationEngineerList)){