11482-【CR】【投资系统】增加审批流程- 增加项目创建记录

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/ApprovalServiceImpl.java

@@ -273,10 +273,10 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
                             tProjectMeeting.getId(),//会议ID
                             String.valueOf(FileType.MEETING.ordinal()),//文件类型:会议
                             userInfo.getNickName());
-
-                    // todo 增加会议创建记录
-                    tProjectCirculationService.insertTProjectCirculation(tProjectMeeting.getProjectPoolId(), tProjectMeeting.getMeetingTheme() + "(会议)", userInfo.getNickName());
-
+                    if(StringUtils.isNotBlank(tProjectMeeting.getMeetingTheme())){
+                        // todo 增加会议创建记录
+                        tProjectCirculationService.insertTProjectCirculation(tProjectMeeting.getProjectPoolId(), tProjectMeeting.getMeetingTheme() + "(会议)", userInfo.getNickName());
+                    }
                     // todo 发送短信-参与人-发起人
                     if (tProjectMeeting.getMeetingType().equals("LX") || tProjectMeeting.getMeetingType().equals("TJ")) {
                         // todo 参与人
@@ -359,6 +359,8 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
                     tProjectPool.setProjectState("f");//项目状态-尽调背调
                     tProjectPool.setUpdateBy(userInfo.getNickName());
                     tProjectPool.setProjectDate(new Date());//立项通过日期
+                    // todo 增加项目创建记录
+                    tProjectCirculationService.insertTProjectCirculation(tProjectPool.getId(),"项目立项完成", userInfo.getNickName());
                 }else{
                     tProjectPool.setProjectStage("3");//项目阶段-项目立项
                     tProjectPool.setProjectState("c");//项目状态-准备立项材料

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/DecisionServiceImpl.java

@@ -273,10 +273,10 @@ public class DecisionServiceImpl extends FlowServiceFactory implements IDecision
                         tProjectMeeting.getId(),//会议ID
                         String.valueOf(FileType.MEETING.ordinal()),//文件类型:会议
                         userInfo.getNickName());
-
-                // todo 增加会议创建记录
-                tProjectCirculationService.insertTProjectCirculation(tProjectMeeting.getProjectPoolId(),tProjectMeeting.getMeetingTheme()+"(会议)",userInfo.getNickName());
-
+                if(StringUtils.isNotBlank(tProjectMeeting.getMeetingTheme())) {
+                    // todo 增加会议创建记录
+                    tProjectCirculationService.insertTProjectCirculation(tProjectMeeting.getProjectPoolId(), tProjectMeeting.getMeetingTheme() + "(会议)", userInfo.getNickName());
+                }
                 // todo 发送短信-参与人-发起人
                 if(tProjectMeeting.getMeetingType().equals("LX") || tProjectMeeting.getMeetingType().equals("TJ")){
                     // todo 参与人
@@ -358,6 +358,8 @@ public class DecisionServiceImpl extends FlowServiceFactory implements IDecision
                     tProjectPool.setProjectState("j");//项目状态-签约协议沟通中
                     tProjectPool.setUpdateBy(userInfo.getNickName());
                     tProjectPool.setDecisionDate(new Date());//投决通过日期
+                    // todo 增加项目创建记录
+                    tProjectCirculationService.insertTProjectCirculation(tProjectPool.getId(),"项目投决完成", userInfo.getNickName());
                 }else{
                     tProjectPool.setProjectStage("5");//项目阶段-项目投决
                     tProjectPool.setProjectState("c");//项目状态-

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/InvestigateServiceImpl.java

@@ -136,9 +136,9 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
                     tProjectInvestigate.setProcInstId(pInst.getProcessInstanceId());
                     tProjectInvestigate.setCreateBy(userId);
                     if(tProjectInvestigate.isFlag()){
-                        //tProjectInvestigate.setStatus(1);//提交
+                        tProjectInvestigate.setStatus(1);//提交
                     }else{
-                        //tProjectInvestigate.setStatus(0);//暂存
+                        tProjectInvestigate.setStatus(0);//暂存
                     }
                     // todo 保存尽职背调附件信息
                     tUnifyFileService.insertTUnifyFileList(tProjectInvestigate.getListFile(),
@@ -218,7 +218,6 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
             List<String> userIds = Arrays.asList(tProjectInvestigate.getInvestigatePersonId().split(","));
             formProperties.put("uploadList", userIds);
         }
-
         Map<String, Object> fpMap = flowService.getFormProperties(task.getProcessDefinitionId(), task.getId());
         try {
             rs = flowService.taskComplete( task.getId(), tProjectInvestigate.isFlag(), formProperties, userInfo.getUserId().toString());
@@ -292,12 +291,14 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
             // 表示流程已经审批结束了
             if (processInstance == null) {
                 flow.setStatus(FlowStatusEnum.ENDED.getName());
-                if (!"modifyApply".equals(task.getTaskDefinitionKey())&&!"president".equals(task.getTaskDefinitionKey())) {
+                if (!"modifyApply".equals(task.getTaskDefinitionKey())) {
                     tProjectInvestigate.setStatus(3);
                     tProjectPool.setProjectStage("5");//项目阶段-项目投决
                     tProjectPool.setProjectState("h");//项目状态-准备项目投决材料
                     tProjectPool.setUpdateBy(userInfo.getNickName());
                     //tProjectPool.setInvestigateDate(new Date());//投决通过日期
+                    // todo 增加项目创建记录
+                    tProjectCirculationService.insertTProjectCirculation(tProjectPool.getId(),"尽职背调完成", userInfo.getNickName());
                 }else{
                     tProjectPool.setProjectStage("4");//项目阶段-尽职背调
                     tProjectPool.setProjectState("f");//项目状态-尽职背调

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/InvestmentOpportunityServiceImpl.java

@@ -338,15 +338,11 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
                     tProjectPool.setStatus(3);
                     tProjectPool.setProjectStage("3");//项目阶段-项目立项
                     tProjectPool.setProjectState("c");//项目状态-准备立项材料
+                    // todo 增加项目创建记录
+                    tProjectCirculationService.insertTProjectCirculation(tProjectPool.getId(), "项目报备完成", userInfo.getNickName());
                 }
             }
             tProjectPool.setUpdateBy(userInfo.getNickName());
-            // todo 增加项目创建记录
-            TProjectCirculation tProjectCirculation = new TProjectCirculation();
-            tProjectCirculation.setProjectPoolId(tProjectPool.getId());
-            tProjectCirculation.setStageName(tProjectPool.getStageName() + "-" + tProjectPool.getStateName());
-            tProjectCirculation.setCreateBy(userInfo.getNickName());
-            tProjectCirculationService.insertTProjectCirculation(tProjectCirculation);
 
             tProjectPoolService.updateTProjectPool(tProjectPool);
             activitiBaseInfoService.addActivitiBaseInfo(flow);

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/TerminationServiceImpl.java

@@ -255,6 +255,8 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                     tProjectPool.setProjectStage("8");//项目阶段-项目终止
                     tProjectPool.setProjectState("p");//项目状态-终止通过
                     tProjectPool.setUpdateBy(userInfo.getNickName());
+                    // todo 增加项目创建记录
+                    tProjectCirculationService.insertTProjectCirculation(tProjectPool.getId(),"项目终止完成", userInfo.getNickName());
 
                 }else{
                     tProjectPool.setProjectStage("8");//项目阶段-项目终止