From 8da1dcfe64b37e1282d9a5e8b8234cbb6ef97bb6 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Sat, 1 Apr 2023 12:10:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=87=B3=E8=8D=89=E7=A8=BF=E7=AE=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index f4c4c3a..5397128 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -445,7 +445,9 @@ public class TodoCenterManage { updateWithdrawProjectStatus(user.getUserId(), declaredProject); // 保存到草稿箱中 ProjectDraftSaveDTO draftSaveDto = new ProjectDraftSaveDTO(); - BeanUtils.copyProperties(declaredProject,draftSaveDto); + ProjectDTO projectInfo = new ProjectDTO(); + BeanUtils.copyProperties(declaredProject,projectInfo); + draftSaveDto.setProjectInfo(projectInfo); declaredProjectManage.saveToDraft(draftSaveDto); // 并删除项目库中该项目信息 projectService.removeById(declaredProject); From dcd8e58c718ed7206af2d3ffd29c63aafac947e8 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Sat, 1 Apr 2023 13:59:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E4=BF=9D=E5=AD=98=E5=85=B3=E8=81=94=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java index 252b698..d4065f4 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java @@ -21,6 +21,7 @@ import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; import com.ningdatech.pmapi.projectdeclared.model.dto.PretrialDeclaredExportDTO; import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO; import com.ningdatech.pmapi.projectdeclared.model.req.ConstrctionPlanListReq; +import com.ningdatech.pmapi.projectlib.enumeration.InstTypeEnum; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum; import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; @@ -186,6 +187,7 @@ public class ConstructionPlanManage { ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); projectInst.setInstCode(instanceId); + projectInst.setInstType(InstTypeEnum.CONSTRUCTION_PLAN_REVIEW.getCode()); projectInst.setCreatOn(LocalDateTime.now()); projectInst.setUpdateOn(LocalDateTime.now()); projectInstService.save(projectInst); From e006bc8740a4f3421d3b61e201513f78d0bfd24d Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Sat, 1 Apr 2023 15:50:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A2=AB=E9=80=80=E5=9B=9E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 5397128..18c12db 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -1311,14 +1311,8 @@ public class TodoCenterManage { if(!modifyProject(projectDto)){ throw new BusinessException("调整项目失败!"); } - - //最后去审批(通过)当前退回节点的审核任务 - ReqProcessHandlerDTO handlerDTO = new ReqProcessHandlerDTO(); - handlerDTO.setProjectId(dto.getProjectId()); - handlerDTO.setInstanceId(dto.getInstanceId()); - handlerDTO.setTaskId(dto.getTaskId()); - handlerDTO.setAction(ProcessHandlerEnum.PASS); - handler(handlerDTO); + // 更新当前流程状态为审核中 + processTaskService.updateProInstStatus(dto.getInstanceId()); return dto.getInstanceId(); }