67076 studio撤回、流程重置,将认证工程师的待办中心任务转为已办。

This commit is contained in:
wangzhijiang
2023-03-27 14:16:50 +08:00
parent d2a912bbf5
commit 6092d45424
@@ -2070,6 +2070,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
String itemName = (String) standNameAndItemName.get("itemName");
try {
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
// 把交付结果、截止日期清空,流程状态 设置为 清单待发布
LambdaUpdateWrapper<ProjectCertificationInventoryEO> 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<Proj
detailRemoveWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
this.processInfoDetailEOService.remove(detailRemoveWrap);
for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) {
// 把交付结果、截止日期清空,流程状态 设置为 清单待发布
LambdaUpdateWrapper<ProjectCertificationInventoryEO> 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<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
if(CollectionUtils.isNotEmpty(certificationEngineerList)){