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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectPoolController.java

@@ -135,7 +135,6 @@ public class TProjectPoolController extends BaseController
         startPage();
         tProjectPool.setProjectStage("3");
         tProjectPool.setDelFlag("0");
-        tProjectPool.setProjectStatus("0");
         List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
                             .stream().map(n -> {
                                 n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"LX"));

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

@@ -191,6 +191,7 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
                     tProjectPool.setId(tProjectApproval.getProjectPoolId());
                     tProjectPool.setProjectStage("3");//项目阶段-项目立项
                     tProjectPool.setProjectState("d");//项目状态-项目立项
+                    tProjectPool.setProjectStatus("0");//项目机会状态-正常
                     tProjectPoolService.updateTProjectPool(tProjectPool);
                     return AjaxResult.success();
                 }

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

@@ -256,18 +256,19 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                     //关闭该项目存在的流程（投资机会、项目立项、尽职背调、项目投决）
 
                     tProjectTermination.setStatus(3);
-                    tProjectPool.setProjectStage("8");//项目阶段-项目终止
-                    tProjectPool.setProjectState("p");//项目状态-终止通过
+                    /*tProjectPool.setProjectStage("8");//项目阶段-项目终止
+                    tProjectPool.setProjectState("p");//项目状态-终止通过*/
                     tProjectPool.setUpdateBy(userInfo.getNickName());
+                    tProjectPool.setProjectStatus("1");//项目机会状态为终止
                     // todo 增加项目创建记录
                     tProjectCirculationService.insertTProjectCirculation(tProjectPool.getId(),"项目终止完成", userInfo.getNickName());
 
-                }else{
-                    tProjectPool.setProjectStage("8");//项目阶段-项目终止
+                }/*else{
+                    tProjectPool.setProjectStage("6");//项目阶段-
                     tProjectPool.setProjectState("o");//项目状态-
                     tProjectPool.setDelFlag("0");
                     tProjectPool.setUpdateBy(userInfo.getNickName());
-                }
+                }*/
                 tProjectPoolService.updateTProjectPool(tProjectPool);
             }
 

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TProjectPoolVo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain.vo;
+package com.ruoyi.invest.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;

ruoyi-system/src/main/resources/mapper/invest/TProjectPoolMapper.xml

@@ -145,6 +145,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectState != null  and projectState != ''"> and a.project_state = #{projectState}</if>
             <if test="delFlag != null  and delFlag != ''"> and a.del_flag = #{delFlag}</if>
             <if test="projectStatus != null  and projectStatus != ''"> and a.project_status = #{projectStatus}</if>
+            <if test="status != null"> and a.status = #{status}</if>
+            <if test="approvalFlag != null and approvalFlag  != ''">and a.approval_flag = #{approvalFlag}</if>
+            <if test="investigateFlag != null and investigateFlag  != ''">and a.investigate_flag = #{investigateFlag}</if>
+            <if test="decisionFlag != null and decisionFlag  != ''">and a.decision_flag = #{decisionFlag}</if>
         </where>
     </select>