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 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 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 certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList); if(CollectionUtils.isNotEmpty(certificationEngineerList)){