调整投决申请列表、立项申请列表增加管理数据

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

@@ -74,6 +74,13 @@ public class TProjectPoolController extends BaseController
     @Autowired
     private ITProjectInvestigateService tProjectInvestigateService;
 
+    @Autowired
+    private ITProjectApprovalService tProjectApprovalService;
+
+    @Autowired
+    private ITProjectDecisionService tProjectDecisionService;
+
+
     /**
      * 查询项目池列表
      */
@@ -110,9 +117,10 @@ public class TProjectPoolController extends BaseController
     public TableDataInfo listApproval(TProjectPool tProjectPool)
     {
         startPage();
-        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
+                .stream().map(n -> {
                     n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"LX"));
-
+                    n.settProjectApproval(tProjectApprovalService.listProjectPoolIdNew(n.getId()));
                     return n;
                 }).collect(Collectors.toList());
         return getDataTable(list);
@@ -127,10 +135,11 @@ public class TProjectPoolController extends BaseController
     public TableDataInfo listInvestigate(TProjectPool tProjectPool)
     {
         startPage();
-        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
-            n.settProjectInvestigate(tProjectInvestigateService.listProjectPoolIdNew(n.getId()));
-            return n;
-        }).collect(Collectors.toList());
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
+                .stream().map(n -> {
+                    n.settProjectInvestigate(tProjectInvestigateService.listProjectPoolIdNew(n.getId()));
+                    return n;
+                }).collect(Collectors.toList());
         return getDataTable(list);
     }
 
@@ -143,10 +152,12 @@ public class TProjectPoolController extends BaseController
     public TableDataInfo listDecision(TProjectPool tProjectPool)
     {
         startPage();
-        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
-            n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"TJ"));
-            return n;
-        }).collect(Collectors.toList());
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
+                .stream().map(n -> {
+                    n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"TJ"));
+                    n.settProjectDecision(tProjectDecisionService.listProjectPoolIdNew(n.getId()));
+                    return n;
+                }).collect(Collectors.toList());
         return getDataTable(list);
     }
 

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectPool.java

@@ -568,6 +568,14 @@ public class TProjectPool extends BaseEntity
         this.tProjectApproval = tProjectApproval;
     }
 
+    public TProjectDecision gettProjectDecision() {
+        return tProjectDecision;
+    }
+
+    public void settProjectDecision(TProjectDecision tProjectDecision) {
+        this.tProjectDecision = tProjectDecision;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -58,4 +58,11 @@ public interface TProjectApprovalMapper
      * @return 结果
      */
     public int deleteTProjectApprovalByIds(String[] ids);
+
+    /**
+     * 根据项目ID获取最新立项申请
+     * @param projectPoolId
+     * @return
+     */
+    TProjectApproval listProjectPoolIdNew(String projectPoolId);
 }

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

@@ -58,4 +58,11 @@ public interface TProjectDecisionMapper
      * @return 结果
      */
     public int deleteTProjectDecisionByIds(String[] ids);
+
+    /**
+     * 根据项目ID获取最新投决申请
+     * @param projectPoolId
+     * @return
+     */
+    TProjectDecision listProjectPoolIdNew(String projectPoolId);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectApprovalService.java

@@ -2,6 +2,7 @@ package com.ruoyi.invest.service;
 
 import java.util.List;
 import com.ruoyi.invest.domain.TProjectApproval;
+import com.ruoyi.invest.domain.TProjectInformation;
 
 /**
  * 立项申请Service接口
@@ -58,4 +59,11 @@ public interface ITProjectApprovalService
      * @return 结果
      */
     public int deleteTProjectApprovalById(String id);
+
+    /**
+     * 根据项目ID获取最新立项申请
+     * @param projectPoolId
+     * @return
+     */
+    public TProjectApproval listProjectPoolIdNew(String projectPoolId);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/ITProjectDecisionService.java

@@ -1,6 +1,8 @@
 package com.ruoyi.invest.service;
 
 import java.util.List;
+
+import com.ruoyi.invest.domain.TProjectApproval;
 import com.ruoyi.invest.domain.TProjectDecision;
 
 /**
@@ -58,4 +60,11 @@ public interface ITProjectDecisionService
      * @return 结果
      */
     public int deleteTProjectDecisionById(String id);
+
+    /**
+     * 根据项目ID获取最新投决申请
+     * @param projectPoolId
+     * @return
+     */
+    public TProjectDecision listProjectPoolIdNew(String projectPoolId);
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectApprovalServiceImpl.java

@@ -94,4 +94,14 @@ public class TProjectApprovalServiceImpl implements ITProjectApprovalService
     {
         return tProjectApprovalMapper.deleteTProjectApprovalById(id);
     }
+
+    /**
+     * 根据项目ID获取最新立项申请
+     * @param projectPoolId
+     * @return
+     */
+    @Override
+    public TProjectApproval listProjectPoolIdNew(String projectPoolId) {
+        return tProjectApprovalMapper.listProjectPoolIdNew(projectPoolId);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/invest/service/impl/TProjectDecisionServiceImpl.java

@@ -94,4 +94,14 @@ public class TProjectDecisionServiceImpl implements ITProjectDecisionService
     {
         return tProjectDecisionMapper.deleteTProjectDecisionById(id);
     }
+
+    /**
+     * 根据项目ID获取最新投决申请
+     * @param projectPoolId
+     * @return
+     */
+    @Override
+    public TProjectDecision listProjectPoolIdNew(String projectPoolId) {
+        return tProjectDecisionMapper.listProjectPoolIdNew(projectPoolId);
+    }
 }

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

@@ -97,4 +97,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="listProjectPoolIdNew" parameterType="String" resultMap="TProjectApprovalResult">
+        <include refid="selectTProjectApprovalVo"/>
+        where project_pool_id = #{projectPoolId} and del_flag = 0
+        ORDER BY create_time DESC LIMIT 1
+    </select>
+
+
 </mapper>

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

@@ -94,4 +94,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="listProjectPoolIdNew" parameterType="String" resultMap="TProjectDecisionResult">
+        <include refid="selectTProjectDecisionVo"/>
+        where project_pool_id = #{projectPoolId} and del_flag = 0
+        ORDER BY create_time DESC LIMIT 1
+    </select>
+
 </mapper>