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 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); 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 1101f29cf..984e31674 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 pidQueryWrap = new QueryWrapper<>(); + pidQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,ids); + List 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 = "";