From b3b2ae43804cee295a3485ab32e90cd8b2e7cfac Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 24 Mar 2023 17:01:10 +0800
Subject: [PATCH 1/2] =?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);

From 4349c4a8f120be91da38e3705eb09f4ef963f24d Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Fri, 24 Mar 2023 17:36:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?67031=20studio=E6=92=A4=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88=E7=9A=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=BE=85=E6=A0=A1=E6=A0=B8=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=92=A4=E5=9B=9E=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLawsInventoryEOServiceImpl.java      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 3c8556943..77839e945 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -10559,6 +10559,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			return flag;
 		}).collect(Collectors.toList());
 
+		// 将待办中心法规工程师的 清单确认 待办任务转为已办
+		QueryWrapper<ProcessInfoDetailEO> pidQueryWrap = new QueryWrapper<>();
+		pidQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,ids);
+		List<ProcessInfoDetailEO> pidList = this.processInfoDetailEOService.list(pidQueryWrap);
+		if(CollectionUtils.isNotEmpty(pidList)){
+			pidList.forEach(pid -> {
+				pid.setStatus(TaskStatusEnum.HAVE_DONE.getValue());
+			});
+			this.processInfoDetailEOService.updateBatchById(pidList);
+		}
+
+
 		this.lawsInventoryEOListSortByInventoryAffirmDueDate(projectLawsInventoryEOS);
 		Date inventoryAffirmDueDate = projectLawsInventoryEOS.get(0).getInventoryAffirmDueDate();
 		String endTime = "";