11482-【CR】【投资系统】增加审批流程- 项目观望列表

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

@@ -6,30 +6,20 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.FileType;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.flowable.domain.vo.FlowTaskVo;
 import com.ruoyi.flowable.service.IInvestmentOpportunityService;
 import com.ruoyi.invest.domain.*;
 import com.ruoyi.invest.domain.dto.InvestDto;
 import com.ruoyi.invest.service.*;
 import com.ruoyi.system.domain.vo.TProjectPoolVo;
-import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 项目池Controller
@@ -59,6 +49,16 @@ public class InvestmentOpportunityController extends BaseController
 
     @Autowired
     private ITProjectPoolService tProjectPoolService;
+    //所有项目观望列表
+    @ApiOperation("所有项目观望列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/allWatchlist")
+    public TableDataInfo allWatchlist(TProjectPool tProjectPool)
+    {
+        startPage();
+        List<TProjectPoolVo> list=investmentOpportunityService.selectAllWatchList(tProjectPool);
+        return getDataTable(list);
+    }
 
     /**
      * 查询所有投资机会流程

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

@@ -20,6 +20,7 @@ public interface IInvestmentOpportunityService
 {
     List<TProjectPool> selectTProjectList(TProjectPool tProjectPool);
     List<TProjectPoolVo> selectAllInvestmentOpportunityList(TProjectPool tProjectPool);
+    List<TProjectPoolVo> selectAllWatchList(TProjectPool tProjectPool);
     List<TProjectPoolVo> selectAllApprovedList(TProjectPool tProjectPool);
     List<TProjectPoolVo> getMyTaskList(String userId, TProjectPool tProjectPool);
     List<TProjectPoolVo> getMyDoneTaskList(String userId, TProjectPool tProjectPool);

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

@@ -89,6 +89,10 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
         return investmentOpportunityMapper.selectAllInvestmentOpportunityList(tProjectPool);
     }
     @Override
+    public List<TProjectPoolVo> selectAllWatchList(TProjectPool tProjectPool){
+        return investmentOpportunityMapper.selectAllWatchList(tProjectPool);
+    }
+    @Override
     public List<TProjectPoolVo> selectAllApprovedList(TProjectPool tProjectPool){
         return investmentOpportunityMapper.selectAllApprovedList(tProjectPool);
     }

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

@@ -17,6 +17,8 @@ public interface InvestmentOpportunityMapper {
     List<TProjectPool> selectTProjectList(TProjectPool tProjectPool);
     /*查询所有投资机会流程*/
     List<TProjectPoolVo> selectAllInvestmentOpportunityList(@Param("projectPool")TProjectPool tProjectPool);
+    /*查询所有项目观望列表*/
+    List<TProjectPoolVo> selectAllWatchList(@Param("projectPool")TProjectPool tProjectPool);
     /*查询所有额审批通过投资机会*/
     List<TProjectPoolVo> selectAllApprovedList(@Param("projectPool")TProjectPool tProjectPool);
     /*待办任务*/

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

@@ -314,7 +314,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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="2" and a.status=3
+        where a.project_status="2" and a.status=3
         <include refid="where_sql"></include>
     </select>
     <select id="selectAllApprovedList" resultMap="TProjectPoolVoResult">

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

@@ -1,4 +1,12 @@
 import request from '@/utils/request'
+// 所有项目观望列表
+export function getAllWatchList(query) {
+  return request({
+    url: '/project/investmentOpportunity/allWatchlist',
+    method: 'get',
+    params: query
+  })
+}
 // 所有投资机会列表
 export function getAllInvestOppList(query) {
   return request({

ruoyi-ui/src/views/project/termination/watchList.vue

@@ -190,11 +190,22 @@
         </template>
       </el-table-column>
       <!-- delFlag -->
-      <el-table-column label="状态" align="center" prop="investHead">
+      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
         <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-          </div>
+          <!-- 定义状态文本映射对象 -->
+          <el-tag
+            :type="{
+              0: 'success',
+              1: 'danger',
+              2: 'warning'
+            }[scope.row.projectStatus] || 'info'"
+          >
+            {{ {
+            0: '正常',
+            1: '终止',
+            2: '观望'
+          }[scope.row.projectStatus] || '未知状态' }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="startUserName">
@@ -258,6 +269,9 @@ import {
   getAllTerminationList,
   listTerminationList,
 } from "@/api/project/termination/pool";
+import {
+  getAllWatchList,
+} from "@/api/project/investOpp/pool";
 import { listChannel } from "@/api/invest/channel";
 import dueDiligenceList from "../investigate/dueDiligenceList";
 import meetingList from "../meetingList.vue";
@@ -341,10 +355,10 @@ export default {
     });
   },
   methods: {
-    /** 查询所有项目终止列表 */
+    /** 查询所有项目观望列表 */
     getList() {
       this.loading = true;
-      getAllTerminationList(this.queryParams).then((response) => {
+      getAllWatchList(this.queryParams).then((response) => {
         this.poolList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -401,7 +415,7 @@ export default {
         // 终止申请
         this.$refs.meetingList.showZZApplyPop();
       }
-  
+
       // this.$router.push({ path: "/invest/pool/add" });
     },
     handleSelectData(type, otherData) {