11482-【CR】【投资系统】增加审批流程- 项目立项、尽职背调、项目投决

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ApprovalController.java

@@ -38,7 +38,16 @@ public class ApprovalController extends BaseController {
     @Autowired
     private IApprovalService approvalService;
 
-
+    //所有项目立项流程列表
+    @ApiOperation("所有项目立项流程列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(TProjectApproval tProjectApproval)
+    {
+        startPage();
+        List<ProjectApprovalVo> list=approvalService.selectAllApprovalList(tProjectApproval);
+        return getDataTable(list);
+    }
     //我的待办任务
     @ApiOperation("我的待办任务列表")
     @PreAuthorize("@ss.hasPermi('invest:pool:list')")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DecisionController.java

@@ -39,7 +39,16 @@ import java.util.List;
 public class DecisionController extends BaseController {
     @Autowired
     private IDecisionService decisionService;
-
+    //所有项目投决流程列表
+    @ApiOperation("所有项目投决流程列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(TProjectDecision tProjectDecision)
+    {
+        startPage();
+        List<ProjectDecisionVo> list=decisionService.selectAllDecisionList(tProjectDecision);
+        return getDataTable(list);
+    }
 
     //我的待办任务
     @ApiOperation("我的待办任务列表")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/InvestigateController.java

@@ -32,7 +32,16 @@ public class InvestigateController extends BaseController {
     @Autowired
     private IInvestigateService investigateService;
 
-
+    //所有尽职背调流程列表
+    @ApiOperation("所有尽职背调流程列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(TProjectInvestigate tProjectInvestigate)
+    {
+        startPage();
+        List<ProjectInvestigateVo> list=investigateService.selectAllInvestigateList(tProjectInvestigate);
+        return getDataTable(list);
+    }
     //我的待办任务
     @ApiOperation("我的待办任务列表")
     @PreAuthorize("@ss.hasPermi('invest:pool:list')")

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IApprovalService.java

@@ -17,6 +17,8 @@ import java.util.Map;
  */
 public interface IApprovalService
 {
+
+    List<ProjectApprovalVo> selectAllApprovalList(TProjectApproval tProjectApproval);
     List<ProjectApprovalVo> getMyTaskList(String userId, TProjectApproval tProjectApproval);
     List<ProjectApprovalVo> getMyDoneTaskList(String userId, TProjectApproval tProjectApproval);
     List<ProjectApprovalVo> getMyList(String userId,TProjectApproval tProjectApproval);

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IDecisionService.java

@@ -17,6 +17,7 @@ import java.util.Map;
  */
 public interface IDecisionService
 {
+    List<ProjectDecisionVo> selectAllDecisionList(TProjectDecision tProjectDecision);
     List<ProjectDecisionVo> getMyTaskList(String userId, TProjectDecision tProjectDecision);
     List<ProjectDecisionVo> getMyDoneTaskList(String userId, TProjectDecision tProjectDecision);
     List<ProjectDecisionVo> getMyList(String userId,TProjectDecision tProjectDecision);

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IInvestigateService.java

@@ -16,6 +16,7 @@ import java.util.Map;
  */
 public interface IInvestigateService
 {
+    List<ProjectInvestigateVo> selectAllInvestigateList(TProjectInvestigate tProjectInvestigate);
     List<ProjectInvestigateVo> getMyTaskList(String userId, TProjectInvestigate tProjectInvestigate);
     List<ProjectInvestigateVo> getMyDoneTaskList(String userId, TProjectInvestigate tProjectInvestigate);
     List<ProjectInvestigateVo> getMyList(String userId,TProjectInvestigate tProjectInvestigate);

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

@@ -72,6 +72,10 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
     @Autowired
     private TProjectScoringMapper tProjectScoringMapper;
     @Override
+    public List<ProjectApprovalVo> selectAllApprovalList(TProjectApproval tProjectApproval){
+        return approvalMapper.selectAllApprovalList(tProjectApproval);
+    }
+    @Override
     public List<ProjectApprovalVo> getMyTaskList(String userId, TProjectApproval tProjectApproval){
         return approvalMapper.getMyTaskList(userId, tProjectApproval);
     }

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

@@ -83,6 +83,10 @@ public class DecisionServiceImpl extends FlowServiceFactory implements IDecision
     @Autowired
     private TProjectScoringMapper tProjectScoringMapper;
     @Override
+    public List<ProjectDecisionVo> selectAllDecisionList(TProjectDecision tProjectDecision){
+        return decisionMapper.selectAllDecisionList(tProjectDecision);
+    }
+    @Override
     public List<ProjectDecisionVo> getMyTaskList(String userId, TProjectDecision tProjectDecision){
         return decisionMapper.getMyTaskList(userId, tProjectDecision);
     }

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

@@ -69,6 +69,10 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
     @Autowired
     private TProjectScoringMapper tProjectScoringMapper;
     @Override
+    public List<ProjectInvestigateVo> selectAllInvestigateList(TProjectInvestigate tProjectInvestigate){
+        return investigateMapper.selectAllInvestigateList(tProjectInvestigate);
+    }
+    @Override
     public List<ProjectInvestigateVo> getMyTaskList(String userId, TProjectInvestigate tProjectInvestigate){
         return investigateMapper.getMyTaskList(userId, tProjectInvestigate);
     }

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/ApprovalMapper.java

@@ -15,6 +15,8 @@ import java.util.List;
  * @date 2024-02-21
  */
 public interface ApprovalMapper {
+    /*所有项目立项流程*/
+    List<ProjectApprovalVo> selectAllApprovalList(@Param("projectApproval")TProjectApproval tProjectApproval);
 
     /*待办任务*/
     List<ProjectApprovalVo> getMyTaskList(@Param("userId") String userId,@Param("projectApproval")TProjectApproval tProjectApproval);

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/DecisionMapper.java

@@ -15,6 +15,8 @@ import java.util.List;
  * @date 2024-02-21
  */
 public interface DecisionMapper {
+    /*待办任务*/
+    List<ProjectDecisionVo> selectAllDecisionList(@Param("projectDecision") TProjectDecision tProjectDecision);
 
     /*待办任务*/
     List<ProjectDecisionVo> getMyTaskList(@Param("userId") String userId, @Param("projectDecision") TProjectDecision tProjectDecision);

ruoyi-system/src/main/java/com/ruoyi/invest/mapper/InvestigateMapper.java

@@ -13,6 +13,8 @@ import java.util.List;
  * @date 2024-02-21
  */
 public interface InvestigateMapper {
+    /*所有尽职背调流程*/
+    List<ProjectInvestigateVo> selectAllInvestigateList(@Param("projectInvestigate") TProjectInvestigate tProjectInvestigate);
 
     /*待办任务*/
     List<ProjectInvestigateVo> getMyTaskList(@Param("userId") String userId, @Param("projectInvestigate") TProjectInvestigate tProjectInvestigate);

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

@@ -68,6 +68,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectApproval.projectSparkle != null  and projectApproval.projectSparkle != ''"> and a.project_sparkle like concat('%',  #{projectApproval.projectSparkle}, '%')</if>
 
     </sql>
+    <select id="selectAllApprovalList" resultMap="ProjectApprovalVoResult">
+        select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,
+        tp.project_state,tp.invest_head, a.project_overview, a.project_sparkle, a.participants_id,
+        a.participants, a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time , a.status,a.need_meeting,
+        p.PROC_INST_ID_ as 'procInsId',
+        p.PROC_DEF_ID_ as 'procDefId',
+        date_format(p.START_TIME_, '%Y-%m-%d %H:%i:%s') as 'applyTime',
+        date_format(p.END_TIME_, '%Y-%m-%d %H:%i:%s') as 'endTime',
+        p.START_USER_ID_ AS 'startUserId',
+        uu.nick_name AS 'startUserName',
+        dd.dept_name AS 'startDeptName',
+        t.NAME_ as 'taskName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
+        DATE_FORMAT(t.CREATE_TIME_ ,'%Y-%m-%d %H:%i') as 'taskCreateTiem',
+        t.ASSIGNEE_ AS 'assignee',
+        ui.nick_name AS 'assigneeName',
+        t.ID_ as 'taskId',
+        t.EXECUTION_ID_ AS 'executionId',
+        rp.DEPLOYMENT_ID_ AS 'deployId'
+        from t_project_approval a
+        left join t_project_pool tp on tp.id=a.project_pool_id
+        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
+        LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
+        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        left join (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        left join ACT_RU_IDENTITYLINK ru on ru.TASK_ID_ = t.ID_
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where a.del_flag="0"
+        <include refid="where_sql"></include>
+    </select>
     <select id="getMyTaskList" resultMap="ProjectApprovalVoResult">
         select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,
         tp.project_state,tp.invest_head, a.project_overview, a.project_sparkle, a.participants_id,

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

@@ -61,6 +61,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectDecision.projectName != null  and projectDecision.projectName != ''"> and tp.project_name like concat('%', #{projectDecision.projectName}, '%')</if>
         <if test="projectDecision.provision != null  and projectDecision.provision != ''"> and a.provision like concat('%', #{projectDecision.provision}, '%')</if>
     </sql>
+    <select id="selectAllDecisionList" resultMap="ProjectDecisionVoResult">
+        select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,
+        tp.project_state,tp.invest_head, a.participants_id,a.participants,
+        a.provision, a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
+        p.PROC_INST_ID_ as 'procInsId',
+        p.PROC_DEF_ID_ as 'procDefId',
+        date_format(p.START_TIME_, '%Y-%m-%d %H:%i:%s') as 'applyTime',
+        date_format(p.END_TIME_, '%Y-%m-%d %H:%i:%s') as 'endTime',
+        p.START_USER_ID_ AS 'startUserId',
+        uu.nick_name AS 'startUserName',
+        dd.dept_name AS 'startDeptName',
+        t.NAME_ as 'taskName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
+        DATE_FORMAT(t.CREATE_TIME_ ,'%Y-%m-%d %H:%i') as 'taskCreateTiem',
+        t.ASSIGNEE_ AS 'assignee',
+        ui.nick_name AS 'assigneeName',
+        t.ID_ as 'taskId',
+        t.EXECUTION_ID_ AS 'executionId',
+        rp.DEPLOYMENT_ID_ AS 'deployId'
+        from t_project_decision a
+        left join t_project_pool tp on tp.id=a.project_pool_id
+        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
+        LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
+        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        left join (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        left join ACT_RU_IDENTITYLINK ru on ru.TASK_ID_ = t.ID_
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where a.del_flag="0"
+        <include refid="where_sql"></include>
+        order by a.create_time desc
+    </select>
     <select id="getMyTaskList" resultMap="ProjectDecisionVoResult">
         select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,
         tp.project_state,tp.invest_head, a.participants_id,a.participants,

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

@@ -83,6 +83,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectInvestigate.investigateName != null  and projectInvestigate.investigateName != ''"> and a.investigate_name like concat('%', #{projectInvestigate.investigateName}, '%')</if>
         <if test="projectInvestigate.investigatePlace != null  and projectInvestigate.investigatePlace != ''"> and a.investigate_place like concat('%', #{projectInvestigate.investigatePlace}, '%')</if>
     </sql>
+    <select id="selectAllInvestigateList" resultMap="ProjectInvestigateVoResult">
+        select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,tp.project_state,tp.invest_head,
+        a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
+        a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
+        a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
+        p.PROC_INST_ID_ as 'procInsId',
+        p.PROC_DEF_ID_ as 'procDefId',
+        date_format(p.START_TIME_, '%Y-%m-%d %H:%i:%s') as 'applyTime',
+        date_format(p.END_TIME_, '%Y-%m-%d %H:%i:%s') as 'endTime',
+        p.START_USER_ID_ AS 'startUserId',
+        uu.nick_name AS 'startUserName',
+        dd.dept_name AS 'startDeptName',
+        t.NAME_ as 'taskName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
+        DATE_FORMAT(t.CREATE_TIME_ ,'%Y-%m-%d %H:%i') as 'taskCreateTiem',
+        t.ASSIGNEE_ AS 'assignee',
+        ui.nick_name AS 'assigneeName',
+        t.ID_ as 'taskId',
+        t.EXECUTION_ID_ AS 'executionId',
+        rp.DEPLOYMENT_ID_ AS 'deployId'
+        from t_project_investigate a
+        left join t_project_pool tp on tp.id=a.project_pool_id
+        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
+        LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
+        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        left join (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        left join ACT_RU_IDENTITYLINK ru on ru.TASK_ID_ = t.ID_
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where a.del_flag="0"
+        <include refid="where_sql"></include>
+        order by a.create_time desc
+    </select>
     <select id="getMyTaskList" resultMap="ProjectInvestigateVoResult">
         select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,tp.project_state,tp.invest_head,
         a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,

ruoyi-ui/src/api/project/approval/pool.js

@@ -1,4 +1,12 @@
 import request from '@/utils/request'
+// 所有项目立项列表
+export function getAllApprovalList(query) {
+  return request({
+    url: '/project/approval/listAll',
+    method: 'get',
+    params: query
+  })
+}
 // 我的待办任务列表
 export function getMyTaskList(query) {
   return request({

ruoyi-ui/src/api/project/decision/pool.js

@@ -1,4 +1,12 @@
 import request from '@/utils/request'
+// 所有项目投决列表
+export function getAllDecisionList(query) {
+  return request({
+    url: '/project/decision/listAll',
+    method: 'get',
+    params: query
+  })
+}
 // 我的待办任务列表
 export function getMyTaskList(query) {
   return request({

ruoyi-ui/src/api/project/investigate/pool.js

@@ -1,4 +1,12 @@
 import request from '@/utils/request'
+// 所有尽职背调列表
+export function getAllInvestigateList(query) {
+  return request({
+    url: '/project/investigate/listAll',
+    method: 'get',
+    params: query
+  })
+}
 // 我的待办任务列表
 export function getMyTaskList(query) {
   return request({

ruoyi-ui/src/views/project/approval/applyList.vue

@@ -129,17 +129,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="公司名称"
-        align="center"
-        prop="tProjectCompany.companyName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.companyName">
-            {{ scope.row.tProjectCompany.companyName }}
-          </div>
-        </template>
-      </el-table-column>
 
       <el-table-column label="所属行业" align="center" prop="industry"
         ><template slot-scope="scope">
@@ -157,35 +146,6 @@
           />
         </template>
       </el-table-column>
-<!--      <el-table-column
-        label="项目状态"
-        align="center"
-        prop="projectState"
-        width="120"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_state"
-            :value="scope.row.projectState"
-          />
-        </template>
-      </el-table-column>-->
-      <el-table-column
-        label="备案时间"
-        align="center"
-        prop="tProjectCompany.filingTime"
-      >
-        <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
-          }}</span>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="立项通过日期" align="center" prop="projectDate">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>-->
       <el-table-column
         label="已发起立项申请"
         align="center"
@@ -204,19 +164,17 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
+      <el-table-column label="项目概况" align="center" prop="projectOverview">
         <template slot-scope="scope">
-          <div
-            v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-            :title="scope.row.tProjectChannel.channelName"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
+          <div :title="scope.row.projectOverview">
+            {{ scope.row.projectOverview }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目亮点" align="center" prop="projectSparkle">
+        <template slot-scope="scope">
+          <div :title="scope.row.projectSparkle">
+            {{ scope.row.projectSparkle }}
           </div>
         </template>
       </el-table-column>
@@ -232,6 +190,29 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="申请人" align="center" prop="startUserName">
+        <template slot-scope="scope">
+          <div :title="scope.row.startUserName">
+            {{ scope.row.startUserName }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请日期" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <div :title="scope.row.status">
+            <span v-if="scope.row.status === 0">暂存</span>
+            <span v-else-if="scope.row.status === 1">已提交</span>
+            <span v-else-if="scope.row.status === 2">审批中</span>
+            <span v-else-if="scope.row.status === 3">审批完成</span>
+            <span v-else-if="scope.row.status === 4">关闭</span>
+          </div>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -255,6 +236,7 @@
 
 <script>
 import { listApprovalList, delPool, } from "@/api/invest/pool";
+import { getAllApprovalList } from "@/api/project/approval/pool";
 import { listChannel } from "@/api/invest/channel";
 import meetingList from "../meetingList";
 import businessUpdate from "../../invest/components/businessUpdate";
@@ -338,10 +320,10 @@ export default {
     });
   },
   methods: {
-    /** 查询项目池列表 */
+    /** 查询所有项目立项流程列表 */
     getList() {
       this.loading = true;
-      listApprovalList(this.queryParams).then((response) => {
+      getAllApprovalList(this.queryParams).then((response) => {
         this.poolList = response.rows;
         this.total = response.total;
         this.loading = false;

ruoyi-ui/src/views/project/decision/applyList.vue

@@ -129,17 +129,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="公司名称"
-        align="center"
-        prop="tProjectCompany.companyName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.companyName">
-            {{ scope.row.tProjectCompany.companyName }}
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="所属行业" align="center" prop="industry"
         ><template slot-scope="scope">
           <dict-tag
@@ -169,21 +158,6 @@
           />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="备案时间" align="center" prop="tProjectCompany.filingTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column> -->
-      <el-table-column label="立项通过日期" align="center" prop="projectDate">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="投决通过日期" align="center" prop="decisionDate">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>-->
       <el-table-column
         label="已发起投决申请"
         align="center"
@@ -203,35 +177,44 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
+      <el-table-column label="股权/其他合作商务条款" align="center" prop="provision">
         <template slot-scope="scope">
-          <div
-            v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-            :title="scope.row.tProjectChannel.channelName"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
+          <div :title="scope.row.provision">
+            {{ scope.row.provision }}
           </div>
         </template>
       </el-table-column>
       <!-- delFlag -->
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="investHead"
-        width="70px"
-      >
+      <el-table-column label="状态" align="center" prop="investHead">
         <template slot-scope="scope">
           <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
             {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="申请人" align="center" prop="startUserName">
+        <template slot-scope="scope">
+          <div :title="scope.row.startUserName">
+            {{ scope.row.startUserName }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请日期" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <div :title="scope.row.status">
+            <span v-if="scope.row.status === 0">暂存</span>
+            <span v-else-if="scope.row.status === 1">已提交</span>
+            <span v-else-if="scope.row.status === 2">审批中</span>
+            <span v-else-if="scope.row.status === 3">审批完成</span>
+            <span v-else-if="scope.row.status === 4">关闭</span>
+          </div>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -258,6 +241,7 @@ import {
   listDecisionList,
   delPool,
 } from "@/api/invest/pool";
+import { getAllDecisionList } from "@/api/project/decision/pool";
 import { listChannel } from "@/api/invest/channel";
 import meetingList from "../meetingList.vue";
 import businessUpdate from "../../invest/components/businessUpdate";
@@ -340,10 +324,10 @@ export default {
     });
   },
   methods: {
-    /** 查询项目池列表 */
+    /** 查询所有项目投决流程列表 */
     getList() {
       this.loading = true;
-      listDecisionList(this.queryParams).then((response) => {
+      getAllDecisionList(this.queryParams).then((response) => {
         this.poolList = response.rows;
         this.total = response.total;
         this.loading = false;

ruoyi-ui/src/views/project/investigate/applyList.vue

@@ -130,28 +130,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="公司名称"
-        align="center"
-        prop="tProjectCompany.companyName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.companyName">
-            {{ scope.row.tProjectCompany.companyName }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="项目所属城市"
-        align="center"
-        prop="tProjectCompany.registeredAddress"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.registeredAddress">
-            {{ scope.row.tProjectCompany.registeredAddress }}
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="所属行业" align="center" prop="industry"
         ><template slot-scope="scope">
           <dict-tag
@@ -168,30 +146,6 @@
           />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="项目状态" align="center" prop="projectState">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_state"
-            :value="scope.row.projectState"
-          />
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        label="备案时间"
-        align="center"
-        prop="tProjectCompany.filingTime"
-      >
-        <template slot-scope="scope">
-          <span>{{
-            parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}")
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="立项通过日期" align="center" prop="projectDate">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
       <el-table-column
         label="已发起尽调申请"
         align="center"
@@ -217,35 +171,50 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
+      <el-table-column label="尽调名称" align="center" prop="investigateName">
         <template slot-scope="scope">
-          <div
-            v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-            :title="scope.row.tProjectChannel.channelName"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
+          <div :title="scope.row.investigateName">
+            {{ scope.row.investigateName }}
           </div>
         </template>
       </el-table-column>
-      <!-- delFlag -->
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="investHead"
-        width="50px"
-      >
+      <el-table-column label="尽调地点" align="center" prop="investigatePlace">
+        <template slot-scope="scope">
+          <div :title="scope.row.investigatePlace">
+            {{ scope.row.investigatePlace }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="investHead">
         <template slot-scope="scope">
           <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
             {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="申请人" align="center" prop="startUserName">
+        <template slot-scope="scope">
+          <div :title="scope.row.startUserName">
+            {{ scope.row.startUserName }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请日期" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <div :title="scope.row.status">
+            <span v-if="scope.row.status === 0">暂存</span>
+            <span v-else-if="scope.row.status === 1">已提交</span>
+            <span v-else-if="scope.row.status === 2">审批中</span>
+            <span v-else-if="scope.row.status === 3">审批完成</span>
+            <span v-else-if="scope.row.status === 4">关闭</span>
+          </div>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -271,6 +240,7 @@ import {
   listInvestigateList,
   delPool,
 } from "@/api/invest/pool";
+import { getAllInvestigateList } from "@/api/project/investigate/pool";
 import { listChannel } from "@/api/invest/channel";
 import dueDiligenceList from "../investigate/dueDiligenceList";
 import businessUpdate from "../../invest/components/businessUpdate";
@@ -353,10 +323,10 @@ export default {
     });
   },
   methods: {
-    /** 查询项目池列表 */
+    /** 查询所有尽职背调流程列表 */
     getList() {
       this.loading = true;
-      listInvestigateList(this.queryParams).then((response) => {
+      getAllInvestigateList(this.queryParams).then((response) => {
         this.poolList = response.rows;
         this.total = response.total;
         this.loading = false;