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); 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..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 @@ -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); @@ -1309,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(); }