网格议题转项目率修改

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/GridIssueCountResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.extract.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @Author zxc
@@ -27,4 +28,9 @@ public class GridIssueCountResultDTO implements Serializable {
      * 网格ID
      */
     private String gridId;
+
+    /**
+     * 网格议题转项目率
+     */
+    private BigDecimal issueToProjectRatio;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java

@@ -67,13 +67,13 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
     List<GridIssueCountResultDTO> selectIssueTotal(@Param("customerId") String customerId,@Param("monthId") String monthId);
 
     /**
-     * @Description  查询俩月的网格议题总数
+     * @Description  查询议题转项目总数
      * @param customerId
      * @param monthId
      * @author zxc
      * @date 2020/9/18 10:20 上午
      */
-    List<GridIssueCountResultDTO> selectIssueTotalTwoMonthPlus(@Param("customerId")String customerId,@Param("monthId") String monthId,@Param("minusMonthId") String minusMonthId);
+    List<GridIssueCountResultDTO> selectIssueTotalShiftProject(@Param("customerId")String customerId, @Param("monthId") String monthId);
 
     /**
      * @Description  网格总项目数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java

@@ -113,9 +113,9 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         // 网格的发文数量
         List<PublishCountResultDTO> publishCountList = articlePublishedGridDailyService.selectArticlePublishCount(customerId, monthId);
         // 网格议题转项目率
-        List<GridIssueCountResultDTO> gridIssueTotalList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, DateUtils.minusMonthId(monthId));
+        List<GridIssueCountResultDTO> gridIssueTotalShiftProjectList = issueExtractService.selectIssueTotalShiftProject(customerId, monthId);
-        List<GridProjectCountResultDTO> gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT);
+        List<GridIssueCountResultDTO> gridIssueTotalList = issueExtractService.selectIssueTotal(customerId, monthId);
-        List<GridProjectCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueTotalList, gridProjectTotalList);
+        List<GridIssueCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueTotalShiftProjectList, gridIssueTotalList);
         // 建群党员数
         List<PartyCreateGroupCountResultDTO> partyCreateGroupCountList = groupExtractService.selectPartyCreateGroupCount(customerId, monthId);
         //结合目前产品，数据来源：话题评论、议题表决
@@ -313,9 +313,10 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         List<GridProjectCountResultDTO> gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT);
         log.info("网格总项目数{}", JSON.toJSONString(gridProjectTotalList));
         //网格议题转项目率
-        List<GridIssueCountResultDTO> gridIssueCountList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, DateUtils.minusMonthId(monthId));
+        List<GridIssueCountResultDTO> gridIssueCountList = issueExtractService.selectIssueTotalShiftProject(customerId, monthId);
         log.info("网格近两个月的议题{}", JSON.toJSONString(gridIssueCountList));
-        List<GridProjectCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueCountList, gridProjectTotalList);
+
+        List<GridIssueCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueCountList, gridIssueTotalList);
         log.info("网格议题转项目率{}", JSON.toJSONString(gridIssueShiftProjectRatio));
         //网格自治项目数 从议题创建到项目关闭，包括处理人，自始至终没有出过议题所属网格
         List<AutoNoMyResultDTO> projectAutoNoMyList = projectLogService.selectProjectAutoNoMy(customerId, monthId);
@@ -391,15 +392,23 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                     }
                 });
             }
-            // 2. 网格总项目数，网格议题转项目率
+            // 2.网格议题转项目率
             if (!CollectionUtils.isEmpty(gridIssueShiftProjectRatio)){
                 gridIssueShiftProjectRatio.forEach(projectTotal -> {
                     if (r.getGridId().equals(projectTotal.getGridId())){
-                        r.setProjectTotal(projectTotal.getProjectTotal());
                         r.setIssueToProjectRatio(projectTotal.getIssueToProjectRatio());
                     }
                 });
             }
+             // 网格总项目数
+            if (!CollectionUtils.isEmpty(gridProjectTotalList)){
+                gridProjectTotalList.forEach(projectTotal -> {
+                    if (r.getGridId().equals(projectTotal.getGridId())) {
+                        r.setProjectTotal(projectTotal.getProjectTotal());
+                    }
+                });
+            }
+
             // 3. 网格办结项目数
             if (!CollectionUtils.isEmpty(gridProjectClosedTotalList)){
                 gridProjectClosedTotalList.forEach(closed -> {
@@ -539,22 +548,22 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
 
     /**
      * @Description
-     * @param gridIssueTotalList
+     * @param gridIssueTotalList 网格下已转项目的议题
-     * @param gridProjectTotalList
+     * @param gridIssueAllTotalList 网格下所有议题
      * @author zxc
      * @date 2020/9/19 2:53 下午
      */
-    public List<GridProjectCountResultDTO> getGridIssueShiftProjectRatio(List<GridIssueCountResultDTO> gridIssueTotalList,List<GridProjectCountResultDTO> gridProjectTotalList){
+    public List<GridIssueCountResultDTO> getGridIssueShiftProjectRatio(List<GridIssueCountResultDTO> gridIssueTotalList,List<GridIssueCountResultDTO> gridIssueAllTotalList){
-        if (!CollectionUtils.isEmpty(gridIssueTotalList) && !CollectionUtils.isEmpty(gridProjectTotalList)) {
+        if (!CollectionUtils.isEmpty(gridIssueTotalList) && !CollectionUtils.isEmpty(gridIssueAllTotalList)) {
-            gridProjectTotalList.forEach(project -> {
+            gridIssueAllTotalList.forEach(allIssue -> {
                 gridIssueTotalList.forEach(issue -> {
-                    if (project.getGridId().equals(issue.getGridId())) {
+                    if (allIssue.getGridId().equals(issue.getGridId())) {
-                        project.setIssueToProjectRatio(getRound(new BigDecimal(project.getProjectTotal()).divide(new BigDecimal(issue.getIssueTotal()),NumConstant.EIGHT,BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
+                        allIssue.setIssueToProjectRatio(getRound(new BigDecimal(allIssue.getIssueTotal()).divide(new BigDecimal(issue.getIssueTotal()),NumConstant.EIGHT,BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL)));
                     }
                 });
             });
         }
-        return gridProjectTotalList;
+        return gridIssueAllTotalList;
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/IssueExtractService.java

@@ -47,7 +47,7 @@ public interface IssueExtractService {
      * @author zxc
      * @date 2020/9/18 10:20 上午
      */
-    List<GridIssueCountResultDTO> selectIssueTotalTwoMonth(String customerId, String monthId, String minusMonthId);
+    List<GridIssueCountResultDTO> selectIssueTotalShiftProject(String customerId, String monthId);
 
     /**
      * @Description  网格总项目数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java

@@ -268,8 +268,8 @@ public class IssueExtractServiceImpl implements IssueExtractService {
      * @date 2020/9/18 10:20 上午
      */
     @Override
-    public List<GridIssueCountResultDTO> selectIssueTotalTwoMonth(String customerId, String monthId, String minusMonthId) {
+    public List<GridIssueCountResultDTO> selectIssueTotalShiftProject(String customerId, String monthId) {
-        return issueMainDailyDao.selectIssueTotalTwoMonthPlus(customerId, monthId, minusMonthId);
+        return issueMainDailyDao.selectIssueTotalShiftProject(customerId, monthId);
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@@ -164,17 +164,16 @@
             )t
     </select>
 
-    <!-- 查询俩月的网格议题总数 -->
+    <!-- 查询议题转项目总数 -->
-    <select id="selectIssueTotalTwoMonthPlus" resultType="com.epmet.dto.extract.form.GridIssueCountResultDTO">
+    <select id="selectIssueTotalShiftProject" resultType="com.epmet.dto.extract.form.GridIssueCountResultDTO">
         SELECT
-            COUNT( ID ) AS issueTotal,
+            GRID_ID,
-            GRID_ID
+            COUNT(ISSUE_ID) AS issueTotal
-        FROM
+        FROM fact_origin_issue_log_daily
-            fact_origin_issue_main_daily
+        WHERE DEL_FLAG = '0'
-        WHERE
+          AND MONTH_ID = #{monthId}
-            DEL_FLAG = 0
           AND CUSTOMER_ID = #{customerId}
-            AND (MONTH_ID = #{monthId} OR MONTH_ID = #{minusMonthId})
+          AND ACTION_CODE = 'shift_project'
         GROUP BY GRID_ID
     </select>