11482-【CR】【投资系统】增加审批流程-项目阶段项目状态

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

@@ -188,6 +188,11 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
                     flowBaseInfo.setStatus(FlowStatusEnum.STARTED.getName());
 
                     activitiBaseInfoService.addActivitiBaseInfo(flowBaseInfo);
+                    TProjectPool tProjectPool=new TProjectPool();
+                    tProjectPool.setId(tProjectApproval.getProjectPoolId());
+                    tProjectPool.setProjectStage("3");//项目阶段-项目立项
+                    tProjectPool.setProjectState("d");//项目状态-项目立项
+                    tProjectPoolService.updateTProjectPool(tProjectPool);
                     return AjaxResult.success();
                 }
                 return AjaxResult.error();
@@ -301,7 +306,11 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
 
                 tProjectScoringService.insertTProjectScoring(tProjectScoring);
             }
-
+            if("president".equals(task.getTaskDefinitionKey())){
+                tProjectPool.setProjectStage("3");//项目阶段-项目立项
+                tProjectPool.setProjectState("e");//项目状态-立项通过
+                tProjectPool.setProjectDate(new Date());//立项通过日期
+            }
             //FlowBaseInfo flow = new FlowBaseInfo();
             if(flow==null){
                 flow = new FlowBaseInfo();
@@ -332,7 +341,8 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
             if (processInstance == null) {
                 flow.setStatus(FlowStatusEnum.ENDED.getName());
                 if (!"modifyApply".equals(task.getTaskDefinitionKey())) {
-                    tProjectPool.setProjectStage("5");
+                    tProjectPool.setProjectStage("4");//项目阶段-尽调背调
+                    tProjectPool.setProjectState("f");//项目状态-尽调背调
                     tProjectPool.setUpdateBy(userInfo.getNickName());
                     tProjectPoolService.updateTProjectPool(tProjectPool);
                 }

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

@@ -240,7 +240,8 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
                 // todo 增加上传评审意见记录
                 tProjectCirculationService.insertTProjectCirculation(tProjectReview.getProjectPoolId(), "上传评估考察意见", userInfo.getNickName());
                 tProjectReviewService.insertTProjectReview(tProjectReview);
-                tProjectPool.setProjectStage("2");//评估考察
+                tProjectPool.setProjectStage("2");//项目阶段-评估考察
+                tProjectPool.setProjectState("b");//项目状态-评估考察中
             }
 
             //FlowBaseInfo flow = new FlowBaseInfo();
@@ -273,7 +274,8 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
                 flow.setStatus(FlowStatusEnum.ENDED.getName());
                 if (!"modifyApply".equals(task.getTaskDefinitionKey())) {
                     tProjectPool.setStatus(3);
-                    tProjectPool.setProjectStage("3");
+                    tProjectPool.setProjectStage("3");//项目阶段-项目立项
+                    tProjectPool.setProjectState("c");//项目状态-准备立项材料
                 }
             }
             tProjectPool.setUpdateBy(userInfo.getNickName());

ruoyi-ui/src/views/invest/components/tableForm.vue

@@ -183,7 +183,7 @@
             <th>打分人</th>
             <th>
               <textarea
-                v-if="form.scoringPerson"
+                v-if="form.createBy"
                 v-model="form.createBy"
                 class="table-textarea"
                 name=""