Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

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);

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 = "";