Merge remote-tracking branch 'origin/dev_screen_data' into dev_temp

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -6,9 +6,9 @@
     <!-- 2、月度指数分析-饼状图 -->
     <select id="selectMonthPieChart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthPieChartResultDTO">
         SELECT
-            service_ablity AS serviceAbility,
-            party_dev_ablity AS partyDevAbility,
-            govern_ablity AS governAbility
+            ROUND(service_ablity,1) AS serviceAbility,
+            ROUND(party_dev_ablity,1) AS partyDevAbility,
+            ROUND(govern_ablity,1) AS governAbility
         FROM
             screen_index_data_monthly
         WHERE
@@ -30,10 +30,10 @@
     <select id="selectMonthBarchart" resultType="com.epmet.evaluationindex.screen.dto.result.MonthBarchartResult">
         SELECT
 	        month_id AS monthId,
-            service_ablity AS serviceAbility,
-            party_dev_ablity AS partyDevAbility,
-            govern_ablity AS governAbility,
-            index_total AS indexTotal
+            ROUND(service_ablity,1) AS serviceAbility,
+            ROUND(party_dev_ablity,1) AS partyDevAbility,
+            ROUND(govern_ablity,1) AS governAbility,
+            ROUND(index_total,1) AS indexTotal
         FROM
             screen_index_data_monthly
         WHERE
@@ -47,10 +47,10 @@
     <select id="selectSubAgencyIndexRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankFormDTO" resultType="com.epmet.evaluationindex.screen.dto.result.SubAgencyIndexRankResultDTO">
         SELECT
             org_name AS NAME,
-            index_total AS totalIndex,
-            govern_ablity AS governAbility,
-            party_dev_ablity AS partyDevAbility,
-            service_ablity AS serviceAbility
+            ROUND(index_total,1) AS totalIndex,
+            ROUND(govern_ablity,1) AS governAbility,
+            ROUND(party_dev_ablity,1) AS partyDevAbility,
+            ROUND(service_ablity,1) AS serviceAbility
         FROM
             screen_index_data_yearly
         WHERE
@@ -66,10 +66,10 @@
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
-        ROUND(index_total, 2) AS totalIndex,
-        ROUND(govern_ablity, 2) AS governAbility,
-        ROUND(party_dev_ablity, 2) AS partyDevAbility,
-        ROUND(service_ablity, 2) AS serviceAbility,
+        ROUND(index_total, 1) AS totalIndex,
+        ROUND(govern_ablity, 1) AS governAbility,
+        ROUND(party_dev_ablity, 1) AS partyDevAbility,
+        ROUND(service_ablity, 1) AS serviceAbility,
         ORG_ID orgId
         FROM
         screen_index_data_monthly

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml

@@ -6,10 +6,10 @@
     <!-- 1、年度平均指数 -->
     <select id="selectYearAverageIndex" resultType="com.epmet.evaluationindex.screen.dto.result.YearAverageIndexResultDTO">
         SELECT
-            index_total AS yearAverageIndex,
-            service_ablity AS serviceAbility,
-            party_dev_ablity AS partyDevAbility,
-            govern_ablity AS governAbility
+            ROUND(index_total,1) AS yearAverageIndex,
+            ROUND(service_ablity,1) AS serviceAbility,
+            ROUND(party_dev_ablity,1) AS partyDevAbility,
+            ROUND(govern_ablity,1) AS governAbility
         FROM
             screen_index_data_yearly
         WHERE
@@ -24,10 +24,10 @@
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
-        ROUND(index_total, 2) AS totalIndex,
-        ROUND(govern_ablity, 2) AS governAbility,
-        ROUND(party_dev_ablity, 2) AS partyDevAbility,
-        ROUND(service_ablity, 2) AS serviceAbility,
+        ROUND(index_total, 1) AS totalIndex,
+        ROUND(govern_ablity, 1) AS governAbility,
+        ROUND(party_dev_ablity, 1) AS partyDevAbility,
+        ROUND(service_ablity, 1) AS serviceAbility,
         ORG_ID orgId
         FROM
         screen_index_data_yearly

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java

@@ -62,11 +62,22 @@ public interface ScreenIndexDataMonthlyDao extends BaseDao<ScreenIndexDataMonthl
      * 获取今年的各月份的平均值
      * @param customerId
      * @param yearId
-     * @param month  做除法运算
+     * @param monthCount  (今年汇总的指数统计，的总月数)做除法运算
      * @return java.util.List<com.epmet.dto.screencoll.form.IndexDataMonthlyFormDTO>
      * @Author zhangyong
      * @Date 15:51 2020-09-04
      **/
     List<IndexDataMonthlyFormDTO> selectListIndexDataMonthlyByYear(@Param("customerId") String customerId,
-                                @Param("yearId") String yearId, @Param("month") String month);
+                                @Param("yearId") String yearId, @Param("monthCount") Integer monthCount);
+
+    /**
+     * 统计 今年，汇总了几个月的 指数统计
+     * @param customerId
+     * @param yearId
+     * @return java.lang.Integer
+     * @Author zhangyong
+     * @Date 18:04 2020-09-11
+     **/
+    Integer selectCountIndexDataMonthly(@Param("customerId") String customerId,
+                                        @Param("yearId") String yearId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -733,7 +733,9 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
      * @Date 22:06 2020-09-04
      **/
     private void insertIndexDataYear(String monthId, String customerId){
-        List<IndexDataMonthlyFormDTO> monthlyFormList = screenIndexDataMonthlyDao.selectListIndexDataMonthlyByYear(customerId, getYearStr(monthId), getMonthStr(monthId));
+        // 查询今年，上报了几个月的指数统计
+        Integer monthCount = screenIndexDataMonthlyDao.selectCountIndexDataMonthly(customerId, getYearStr(monthId));
+        List<IndexDataMonthlyFormDTO> monthlyFormList = screenIndexDataMonthlyDao.selectListIndexDataMonthlyByYear(customerId, getYearStr(monthId), monthCount);
         if (monthlyFormList.size() > NumConstant.ZERO){
             int deleteNum;
             do {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml

@@ -64,10 +64,10 @@
             ORG_ID orgId,
             PARENT_ID parentId,
             ORG_NAME orgName,
-            SUM(INDEX_TOTAL) / #{month} as indexTotal,
-            SUM(PARTY_DEV_ABLITY) / #{month} as partyDevAblity,
-            SUM(SERVICE_ABLITY) / #{month} as serviceAblity,
-            SUM(GOVERN_ABLITY) / #{month} as governAblity
+            SUM(INDEX_TOTAL) / #{monthCount} as indexTotal,
+            SUM(PARTY_DEV_ABLITY) / #{monthCount} as partyDevAblity,
+            SUM(SERVICE_ABLITY) / #{monthCount} as serviceAblity,
+            SUM(GOVERN_ABLITY) / #{monthCount} as governAblity
          FROM screen_index_data_monthly
          WHERE DEL_FLAG = '0'
          AND YEAR_ID = #{yearId}
@@ -75,4 +75,16 @@
          GROUP BY ORG_ID
     </select>
 
+    <select id="selectCountIndexDataMonthly" parameterType="map" resultType="java.lang.Integer">
+         SELECT
+            COUNT(1)
+        FROM(
+            SELECT
+            distinct MONTH_ID
+            FROM screen_index_data_monthly
+            WHERE DEL_FLAG = '0'
+            AND  YEAR_ID = #{yearId}
+            AND CUSTOMER_ID = #{customerId}
+        ) monthCount
+    </select>
 </mapper>