From b3b2ae43804cee295a3485ab32e90cd8b2e7cfac Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 24 Mar 2023 17:01:10 +0800
Subject: [PATCH] =?UTF-8?q?67048=20=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectCertificationInventoryEOServiceImpl.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 48c9672c0..3ddb0eca6 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
@@ -2094,7 +2094,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 				// 把交付结果、截止日期清空，流程状态 设置为 清单待发布
 				LambdaUpdateWrapper<ProjectCertificationInventoryEO> updateWrap = new LambdaUpdateWrapper<>();
 				updateWrap.set(ProjectCertificationInventoryEO::getDeliveryResult,null);
-				updateWrap.set(ProjectCertificationInventoryEO::getEndTime,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);