Merge branch 'invest-dev' of http://git.dgtis.com/15896567520/RuoYi-flowable-master into invest-dev

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

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
@@ -74,6 +75,12 @@ public class TProjectPoolController extends BaseController
     @Autowired
     private ITProjectInvestigatePersonService tProjectInvestigatePersonService;
 
+    @Autowired
+    private ITProjectMeetingService tProjectMeetingService;
+
+    @Autowired
+    private ITProjectScoringService tProjectScoringService;
+
 
     /**
      * 查询项目池列表
@@ -97,6 +104,7 @@ public class TProjectPoolController extends BaseController
     public TableDataInfo listReview(TProjectPool tProjectPool)
     {
         startPage();
+        tProjectPool.setDelFlag("0");
         tProjectPool.setProjectStage("2");
         tProjectPool.setCreateBy(getUserId().toString());
         List<TProjectPool> list = tProjectPoolService.selectTProjectPoolReviewList(tProjectPool);
@@ -113,7 +121,15 @@ public class TProjectPoolController extends BaseController
     {
         startPage();
         tProjectPool.setProjectStage("3");
-        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool);
+        tProjectPool.setDelFlag("0");
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
+                            .stream().map(n -> {
+                                n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"LX"));
+                                if(null != n.gettProjectMeeting()){
+                                    n.settProjectScoring(tProjectScoringService.getCanScoringMeetingId(n.gettProjectMeeting().getId(),getUserId()));
+                                }
+                                return n;
+                            }).collect(Collectors.toList());
         return getDataTable(list);
     }
 
@@ -127,6 +143,7 @@ public class TProjectPoolController extends BaseController
     {
         startPage();
         tProjectPool.setProjectStage("4");
+        tProjectPool.setDelFlag("0");
         List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
                 .stream().map(n -> {
                     n.settProjectInvestigate(tProjectInvestigateService.listProjectPoolIdNew(n.getId()));
@@ -148,7 +165,14 @@ public class TProjectPoolController extends BaseController
     {
         startPage();
         tProjectPool.setProjectStage("5");
-        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool);
+        tProjectPool.setDelFlag("0");
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
+                                n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"TJ"));
+                                if(null != n.gettProjectMeeting()){
+                                    n.settProjectScoring(tProjectScoringService.getCanScoringMeetingId(n.gettProjectMeeting().getId(),getUserId()));
+                                }
+                                return n;
+                            }).collect(Collectors.toList());
         return getDataTable(list);
     }
 
@@ -164,15 +188,21 @@ public class TProjectPoolController extends BaseController
     {
         List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
                 .stream().map(n -> {
-                    n.setChannel(n.gettProjectChannel().getChannelName());
-                    n.setIndustry(dictDataService.selectDictLabel("CUSTOMER_TRADE",n.getIndustry()));
-                    n.setCompany(n.gettProjectCompany().getCompanyName());
-                    n.setProjectContacts(n.gettProjectContacts().getName());
-                    n.setInvestType(dictDataService.selectDictLabel("INVEST_TYPE",n.getInvestType()));
-                    n.setInvestPloy(dictDataService.selectDictLabel("INVEST_PLOY",n.getInvestPloy()));
-                    n.setInvestWorth(dictDataService.selectDictLabel("INVEST_WORTH",n.getInvestWorth()));
-                    n.setProjectStage(dictDataService.selectDictLabel("PROJECT_STAGE",n.getProjectStage()));
-                    n.setProjectState(dictDataService.selectDictLabel("PROJECT_STATE",n.getProjectState()));
+                    if(null != n.gettProjectChannel()){
+                        n.setChannel(n.gettProjectChannel().getChannelName());
+                    }
+                    if(StringUtils.isNotEmpty(n.getIndustry()))n.setIndustry(dictDataService.selectDictLabel("CUSTOMER_TRADE",n.getIndustry()));
+                    if(null != n.gettProjectCompany()){
+                        n.setCompany(n.gettProjectCompany().getCompanyName());
+                    }
+                    if(null != n.gettProjectContacts()){
+                        n.setProjectContacts(n.gettProjectContacts().getName());
+                    }
+                    if(StringUtils.isNotEmpty(n.getInvestType()))n.setInvestType(dictDataService.selectDictLabel("INVEST_TYPE",n.getInvestType()));
+                    if(StringUtils.isNotEmpty(n.getInvestPloy()))n.setInvestPloy(dictDataService.selectDictLabel("INVEST_PLOY",n.getInvestPloy()));
+                    if(StringUtils.isNotEmpty(n.getInvestWorth()))n.setInvestWorth(dictDataService.selectDictLabel("INVEST_WORTH",n.getInvestWorth()));
+                    if(StringUtils.isNotEmpty(n.getProjectStage()))n.setProjectStage(dictDataService.selectDictLabel("PROJECT_STAGE",n.getProjectStage()));
+                    if(StringUtils.isNotEmpty(n.getProjectState()))n.setProjectState(dictDataService.selectDictLabel("PROJECT_STATE",n.getProjectState()));
                     return n;
                 })
                 .collect(Collectors.toList());
@@ -323,4 +353,107 @@ public class TProjectPoolController extends BaseController
         return toAjax(tProjectPoolService.updateTProjectPool(tProjectPool));
     }
 
+    /**
+     * 查询评估考察列表数量
+     */
+    @ApiOperation("查询评估考察列表数量")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping(value = "/getReviewNumber")
+    public AjaxResult getReviewNumber()
+    {
+        TProjectPool tProjectPool = new TProjectPool();
+        tProjectPool.setProjectStage("2");
+        tProjectPool.setCreateBy(getUserId().toString());
+        tProjectPool.setDelFlag("0");
+        Long number = tProjectPoolService.selectTProjectPoolReviewList(tProjectPool).stream().filter(n -> null == n.gettProjectReview()).count();
+
+        return success(number);
+    }
+
+    /**
+     * 查询项目立项列表数量
+     */
+    @ApiOperation("查询项目立项列表数量")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping(value = "/getApprovalNumber")
+    public AjaxResult getApprovalNumber()
+    {
+        TProjectPool tProjectPool = new TProjectPool();
+        tProjectPool.setProjectStage("3");
+        tProjectPool.setDelFlag("0");
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
+                    n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"LX"));
+                    if(null != n.gettProjectMeeting()){
+                        n.settProjectScoring(tProjectScoringService.getCanScoringMeetingId(n.gettProjectMeeting().getId(),getUserId()));
+                    }
+                    return n;
+                }).collect(Collectors.toList());
+        //逻辑验证数量
+        Long number = list.stream().filter(n ->
+                getNickName().equals(n.getInvestHead()) ||
+                (
+                    null != n.gettProjectMeeting() &&
+                    n.gettProjectMeeting().getParticipants().contains(getNickName()) &&
+                    null == n.gettProjectScoring()
+                )).count();
+        return success(number);
+    }
+
+    /**
+     * 查询项目立项列表数量
+     */
+    @ApiOperation("查询项目投决列表数量")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping(value = "/getDecisionNumber")
+    public AjaxResult getDecisionNumber()
+    {
+        TProjectPool tProjectPool = new TProjectPool();
+        tProjectPool.setProjectStage("5");
+        tProjectPool.setDelFlag("0");
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool).stream().map(n -> {
+            n.settProjectMeeting(tProjectMeetingService.listProjectPoolIdNew(n.getId(),"TJ"));
+            if(null != n.gettProjectMeeting()){
+                n.settProjectScoring(tProjectScoringService.getCanScoringMeetingId(n.gettProjectMeeting().getId(),getUserId()));
+            }
+            return n;
+        }).collect(Collectors.toList());
+        // 逻辑验证数量
+        Long number = list.stream().filter(n ->
+                getNickName().equals(n.getInvestHead()) ||
+                        (null != n.gettProjectMeeting() &&
+                        n.gettProjectMeeting().getParticipants().contains(getNickName()) &&
+                        null == n.gettProjectScoring()
+                        )).count();
+        return success(number);
+    }
+
+    /**
+     * 查询项目立项列表数量
+     */
+    @ApiOperation("查询尽职背调列表数量")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping(value = "/getInvestigateNumber")
+    public AjaxResult getInvestigateNumber()
+    {
+        TProjectPool tProjectPool = new TProjectPool();
+        tProjectPool.setProjectStage("4");
+        tProjectPool.setDelFlag("0");
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
+                .stream().map(n -> {
+                    n.settProjectInvestigate(tProjectInvestigateService.listProjectPoolIdNew(n.getId()));
+                    if(null != n.gettProjectInvestigate()){
+                        n.settProjectInvestigatePerson(tProjectInvestigatePersonService.selectByProjectInvestigateId(n.gettProjectInvestigate().getId(),getUserId()));
+                    }
+                    return n;
+                }).collect(Collectors.toList());
+        // 逻辑验证数量
+        Long number = list.stream().filter(n ->
+                getNickName().equals(n.getInvestHead()) ||
+                        (null != n.gettProjectInvestigate() &&
+                        n.gettProjectInvestigate().getInvestigatePerson().contains(getNickName()) &&
+                        null == n.gettProjectInvestigatePerson()
+                        )).count();
+        return success(number);
+    }
+
 }

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

@@ -154,6 +154,14 @@ public class TProjectPool extends BaseEntity
     @ApiModelProperty("评审信息")
     private TProjectReview tProjectReview;
 
+    /** 会议信息 */
+    @ApiModelProperty("会议信息")
+    private TProjectMeeting tProjectMeeting;
+
+    /** 打分记录 */
+    @ApiModelProperty("打分记录")
+    private TProjectScoring tProjectScoring;
+
     /** 尽调信息 */
     @ApiModelProperty("尽调信息")
     private TProjectInvestigate tProjectInvestigate;
@@ -591,6 +599,22 @@ public class TProjectPool extends BaseEntity
         this.tProjectInvestigatePerson = tProjectInvestigatePerson;
     }
 
+    public TProjectMeeting gettProjectMeeting() {
+        return tProjectMeeting;
+    }
+
+    public void settProjectMeeting(TProjectMeeting tProjectMeeting) {
+        this.tProjectMeeting = tProjectMeeting;
+    }
+
+    public TProjectScoring gettProjectScoring() {
+        return tProjectScoring;
+    }
+
+    public void settProjectScoring(TProjectScoring tProjectScoring) {
+        this.tProjectScoring = tProjectScoring;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -140,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="investWorth != null  and investWorth != ''"> and a.invest_worth = #{investWorth}</if>
             <if test="projectStage != null  and projectStage != ''"> and a.project_stage = #{projectStage}</if>
             <if test="projectState != null  and projectState != ''"> and a.project_state = #{projectState}</if>
+            <if test="delFlag != null  and delFlag != ''"> and a.del_flag = #{delFlag}</if>
         </where>
     </select>
     
@@ -254,6 +255,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shareholding != null">shareholding = #{shareholding},</if>
             <if test="projectStage != null">project_stage = #{projectStage},</if>
             <if test="projectState != null">project_state = #{projectState},</if>
+            <if test="approvalFlag != null">approval_flag = #{approvalFlag},</if>
+            <if test="investigateFlag != null">investigate_flag = #{investigateFlag},</if>
+            <if test="decisionFlag != null">decision_flag = #{decisionFlag},</if>
             <if test="mark != null">mark = #{mark},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
@@ -314,6 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="investWorth != null  and investWorth != ''"> and a.invest_worth = #{investWorth}</if>
             <if test="projectStage != null  and projectStage != ''"> and a.project_stage = #{projectStage}</if>
             <if test="projectState != null  and projectState != ''"> and a.project_state = #{projectState}</if>
+            <if test="delFlag != null  and delFlag != ''"> and a.del_flag = #{delFlag}</if>
         </where>
     </select>