|
@@ -175,7 +175,13 @@ public class ConstructionPlanManage { |
|
|
log.info("建设方案项目申报成功 【{}】", instanceId); |
|
|
log.info("建设方案项目申报成功 【{}】", instanceId); |
|
|
|
|
|
|
|
|
// 保存建设项目相关 |
|
|
// 保存建设项目相关 |
|
|
Project buildProject = projectLibManage.saveConstructProjectInDeclared(projectInfo,instanceId,employeeCode,oldProject); |
|
|
|
|
|
|
|
|
Project buildProject = new Project(); |
|
|
|
|
|
if(dto.getRestart()){ |
|
|
|
|
|
//如果是重新提交 不用生成新版本 前面已经生成过了 |
|
|
|
|
|
buildProject = contructionPlanModifyProject(oldProject, instanceId); |
|
|
|
|
|
}else{ |
|
|
|
|
|
buildProject = projectLibManage.saveConstructProjectInDeclared(projectInfo,instanceId,employeeCode,oldProject); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
//发送给第一个审批人消息 |
|
|
//发送给第一个审批人消息 |
|
|
noticeManage.sendFirtUser(buildProject,model.getFormName(),instanceId, |
|
|
noticeManage.sendFirtUser(buildProject,model.getFormName(),instanceId, |
|
@@ -184,6 +190,24 @@ public class ConstructionPlanManage { |
|
|
return instanceId; |
|
|
return instanceId; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private Project contructionPlanModifyProject(Project project, String instanceId) { |
|
|
|
|
|
stateMachineUtils.pass(project); |
|
|
|
|
|
project.setUpdateOn(LocalDateTime.now()); |
|
|
|
|
|
project.setInstCode(instanceId); |
|
|
|
|
|
projectService.updateById(project); |
|
|
|
|
|
|
|
|
|
|
|
//保存项目和实例的关系 |
|
|
|
|
|
ProjectInst projectInst = new ProjectInst(); |
|
|
|
|
|
projectInst.setProjectId(project.getId()); |
|
|
|
|
|
projectInst.setInstCode(instanceId); |
|
|
|
|
|
projectInst.setCreatOn(LocalDateTime.now()); |
|
|
|
|
|
projectInst.setUpdateOn(LocalDateTime.now()); |
|
|
|
|
|
projectInst.setInstType(ProjectProcessStageEnum.CONSTRUCTION_PROJECT_APPROVAL_PROCESS.getCode()); |
|
|
|
|
|
projectInstService.save(projectInst); |
|
|
|
|
|
|
|
|
|
|
|
return project; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 驳回 重新提交建设方案 |
|
|
* 驳回 重新提交建设方案 |
|
|
* |
|
|
* |
|
|