Merge remote-tracking branch 'remotes/origin/dev'

# Conflicts:
#	epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
#	epmet-module/data-report/data-report-server/pom.xml
#	epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
#	epmet-module/data-statistical/data-statistical-server/pom.xml

epmet-gateway/src/main/resources/bootstrap.yml

@@ -442,6 +442,7 @@ epmet:
   urlWhiteList:
     - /data/report/test/test
     - /data/report/screen/**
+    - /data/report/screenkc/**
     - /epmetuser/customerstaff/customerlist
 
   swaggerUrls:

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -67,8 +67,8 @@ public class IndexController {
     }
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:02 上午
      */

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

@@ -54,8 +54,8 @@ public interface ScreenIndexDataMonthlyDao{
     List<MonthBarchartResult> selectMonthBarchart(@Param("agencyId")String agencyId);
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java

@@ -38,8 +38,8 @@ public interface IndexService {
     MonthBarchartResultDTO monthBarchart(MonthBarchartFormDTO monthBarchartFormDTO);
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -57,7 +57,7 @@ public class IndexServiceImpl implements IndexService {
         yearAverageIndexResultDTO.setPartyDevAbility(getRound(yearAverageIndexResultDTO.getPartyDevAbility()));
         yearAverageIndexResultDTO.setGovernAbility(getRound(yearAverageIndexResultDTO.getGovernAbility()));
         yearAverageIndexResultDTO.setServiceAbility(getRound(yearAverageIndexResultDTO.getServiceAbility()));
-        yearAverageIndexResultDTO.setYearAverageIndex(getRound(yearAverageIndexResultDTO.getYearAverageIndex()));
+        yearAverageIndexResultDTO.setYearAverageIndex(yearAverageIndexResultDTO.getPartyDevAbility() + yearAverageIndexResultDTO.getGovernAbility() + yearAverageIndexResultDTO.getServiceAbility());
         return yearAverageIndexResultDTO;
     }
 
@@ -126,7 +126,7 @@ public class IndexServiceImpl implements IndexService {
             barchart.setPartyDevAbility(getRound(barchart.getPartyDevAbility()));
             barchart.setGovernAbility(getRound(barchart.getGovernAbility()));
             barchart.setServiceAbility(getRound(barchart.getServiceAbility()));
-            barchart.setIndexTotal(getRound(barchart.getIndexTotal()));
+            barchart.setIndexTotal(barchart.getPartyDevAbility() + barchart.getGovernAbility() + barchart.getServiceAbility());
         });
         List<MonthBarchartResult> collect = monthBarchartResults.stream().sorted(Comparator.comparing(MonthBarchartResult::getMonthId)).collect(Collectors.toList());
         //升序 当前月份在队尾
@@ -179,8 +179,8 @@ public class IndexServiceImpl implements IndexService {
     }
 
     /**
-     * @Description  4、下级部门指数排行
      * @param subAgencyIndexRankFormDTO
+     * @Description 4、下级组织/部门指数排行 (不包含部门的数据)
      * @author zxc
      * @date 2020/8/20 10:04 上午
      */
@@ -199,7 +199,7 @@ public class IndexServiceImpl implements IndexService {
             indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
             indexRank.setGovernAbility(getRound(indexRank.getGovernAbility()));
             indexRank.setServiceAbility(getRound(indexRank.getServiceAbility()));
-            indexRank.setTotalIndex(getRound(indexRank.getTotalIndex()));
+            indexRank.setTotalIndex(indexRank.getPartyDevAbility() + indexRank.getGovernAbility() + indexRank.getServiceAbility());
         });
         return subAgencyIndexRankResultDTOS;
     }
@@ -218,7 +218,7 @@ public class IndexServiceImpl implements IndexService {
                 rank.setPartyDevAbility(getRound(rank.getPartyDevAbility()));
                 rank.setGovernAbility(getRound(rank.getGovernAbility()));
                 rank.setServiceAbility(getRound(rank.getServiceAbility()));
-                rank.setTotalIndex(getRound(rank.getTotalIndex()));
+                rank.setTotalIndex(rank.getPartyDevAbility() + rank.getGovernAbility() + rank.getServiceAbility());
             });
         }
         return subAgencyIndexRankResultDTOS;

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

@@ -32,8 +32,7 @@
 	        month_id AS monthId,
             service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
             party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
-            govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
+            govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility
-            (service_ablity * SERVICE_ABLITY_WEIGHT + party_dev_ablity * PARTY_DEV_WEIGHT + govern_ablity * GOVERN_ABLITY_WEIGHT) AS indexTotal
         FROM
             screen_index_data_monthly
         WHERE
@@ -43,11 +42,10 @@
             LIMIT 12
     </select>
 
-    <!-- 下级部门指数排行 -->
+    <!-- 下级组织/部门指数排行 (不包含部门的数据) -->
     <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
@@ -57,6 +55,7 @@
             del_flag = '0'
             AND parent_id = #{agencyId}
             AND year_id = #{yearId}
+            AND ORG_TYPE != 'department'
         ORDER BY index_total DESC
             LIMIT #{topNum}
     </select>
@@ -68,8 +67,7 @@
         org_name AS `NAME`,
         service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
         party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
-        govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
+        govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility
-        (service_ablity * SERVICE_ABLITY_WEIGHT + party_dev_ablity * PARTY_DEV_WEIGHT + govern_ablity * GOVERN_ABLITY_WEIGHT) AS totalIndex,
         ORG_ID orgId
         FROM
         screen_index_data_monthly

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

@@ -6,7 +6,6 @@
     <!-- 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
@@ -24,10 +23,9 @@
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
         org_name AS `NAME`,
-        ROUND(index_total, 1) AS totalIndex,
+        govern_ablity AS governAbility,
-        ROUND(govern_ablity, 1) AS governAbility,
+        party_dev_ablity AS partyDevAbility,
-        ROUND(party_dev_ablity, 1) AS partyDevAbility,
+        service_ablity AS serviceAbility,
-        ROUND(service_ablity, 1) AS serviceAbility,
         ORG_ID orgId
         FROM
         screen_index_data_yearly

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcTopicTrendGridMonthlyDao.xml

@@ -16,7 +16,7 @@
                     del_flag = '0'
                 and customer_id = #{customerId}
                 and month_id = monthId
-            )
+            ) "topicCount"
         FROM
             screen_kc_topic_trend_grid_monthly
         WHERE

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenkc/ScreenKcVolunteerSummaryDailyDao.xml

@@ -5,21 +5,31 @@
 
     <select id="selectVolunteerSummaryDaily" resultType="com.epmet.evaluationindex.screen.dto.result.AgeDistributionResultDTO">
         SELECT
-            age_level_1 AS "ageLevel1",
+            SUM(age_level_1) AS "ageLevel1",
-            age_level_2 AS "ageLevel2",
+            SUM(age_level_2) AS "ageLevel2",
-            age_level_3 AS "ageLevel3",
+            SUM(age_level_3) AS "ageLevel3",
-            age_level_4 AS "ageLevel4",
+            SUM(age_level_4) AS "ageLevel4",
-            age_level_5 AS "ageLevel5",
+            SUM(age_level_5) AS "ageLevel5",
-            age_level_6 AS "ageLevel6",
+            SUM(age_level_6) AS "ageLevel6",
-            male_count AS "maleCount",
+            SUM(male_count) AS "maleCount",
-            female_count AS "femaleCount"
+            SUM(female_count) AS "femaleCount"
         FROM
             screen_kc_volunteer_summary_daily
         WHERE
             del_flag = '0'
         AND customer_id = #{customerId}
-        ORDER BY
+        AND date_id = (
-            date_id DESC, created_time DESC
+            select
-        LIMIT 1
+                date_id
+            from
+                screen_kc_volunteer_summary_daily
+            where
+                del_flag = '0'
+            and customer_id = #{customerId}
+            order by
+                date_id desc,
+                created_time desc
+            limit 1
+        )
     </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/eum/IndexCodeEnum.java

@@ -1,7 +1,5 @@
 package com.epmet.eum;
 
-import com.epmet.dto.indexcal.CalculateCommonFormDTO;
-
 /**
  * 需要计算指标code枚举类
  *
@@ -9,43 +7,58 @@ import com.epmet.dto.indexcal.CalculateCommonFormDTO;
  * @date 2020-08-26 11:14
  **/
 public enum IndexCodeEnum {
-    DANG_YUAN_XIANG_GUAN("dangyuanxiangguan", "党员相关", 1),
+    DANG_YUAN_XIANG_GUAN("dangyuanxiangguan", "党员相关", 1, false),
-    WANG_GE_XIANG_GUAN("wanggexiangguan", "网格相关", 1),
+    WANG_GE_XIANG_GUAN("wanggexiangguan", "网格相关", 1, false),
-    SHE_QU_XIANG_GUAN("shequxiangguan", "社区相关", 1),
+    SHE_QU_XIANG_GUAN("shequxiangguan", "社区相关", 1, false),
-    JIE_DAO_XIANG_GUAN("jiedaoxiangguan", "街道相关", 1),
+    JIE_DAO_XIANG_GUAN("jiedaoxiangguan", "街道相关", 1, false),
-    QU_ZHI_BU_MEN("quzhibumen", "区直部门", 1),
+    QU_ZHI_BU_MEN("quzhibumen", "区直部门", 1, false),
-    QUAN_QU_XIANG_GUAN("quanquxiangguan", "全区相关", 1),
+    QUAN_QU_XIANG_GUAN("quanquxiangguan", "全区相关", 1, false),
+
+    DANG_JIAN_NENG_LI("dangjiannengli", "党建能力", 2, false),
+    ZHI_LI_NENG_LI("zhilinengli", "治理能力", 2, false),
+    FU_WU_NENG_LI("fuwunengli", "服务能力", 2, false),
 
-    DANG_JIAN_NENG_LI("dangjiannengli", "党建能力", 2),
+    CAN_YU_YI_SHI("canyuyishi", "参与议事", 4, false),
-    ZHI_LI_NENG_LI("zhilinengli", "治理能力", 2),
+    DANG_WU_HUO_DONG("dangwuhuodong", "党务活动", 4, false),
-    FU_WU_NENG_LI("fuwunengli", "服务能力", 2),
+    LIAN_XI_QUN_ZHONG("lianxiqunzhong", "联系群众", 4, false),
 
-    CAN_YU_YI_SHI("canyuyishi", "参与议事", 4),
+    ZUZHINEIDANGYDLXQZNLKPFPJZ("zuzhineidangydlxqznlkpfpjz", "组织内党员的联系群众能力考评分（平均值）", 5, true),
-    DANG_WU_HUO_DONG("dangwuhuodong", "党务活动", 4),
+    ZUZHINEIDANGYDSYYSNLKPFPJZ("zuzhineidangydcyysnlkpfpjz", "组织内党员的参与议事能力考评分（平均值）", 5, true),
-    LIAN_XI_QUN_ZHONG("lianxiqunzhong", "联系群众", 4),
+    XIA_SHU_SUO_YOU_WGDDJNLPJZ("xiashusuoyouwgddjnlpjz", "下属所有网格的党建能力（平均值）", 5, true),
-    ZUZHINEIDANGYDLXQZNLKPFPJZ("zuzhineidangydlxqznlkpfpjz","组织内党员的联系群众能力考评分（平均值）",5),
+    SHE_QU_XIA_SHU_SYWGZLNLHZPJZ("shequxiashusywgzlnlhzpjz", "社区下属所有网格治理能力汇总（平均值）", 5, true),
-    ZUZHINEIDANGYDSYYSNLKPFPJZ("zuzhineidangydcyysnlkpfpjz","组织内党员的参与议事能力考评分（平均值）",5),
+    SHE_QU_XIA_JI_SYWGFWNLDFPJZ("shequxiajisywgfwnldfpjz", "社区下级所有网格服务能力得分(平均值) ", 5, true),
-    XIA_SHU_SUO_YOU_WGDDJNLPJZ("xiashusuoyouwgddjnlpjz","下属所有网格的党建能力（平均值）",5),
+    JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ("jiedaoxiashusysqdjnlhzpjz", "街道下属所有社区党建能力汇总（平均值）", 5, true),
-    SHE_QU_XIA_SHU_SYWGZLNLHZPJZ("shequxiashusywgzlnlhzpjz","社区下属所有网格治理能力汇总（平均值）",5),
+    JIE_DAO_XIA_SHU_SYSQZLNLHZ("jiedaoxiashusysqzlnlhz", "街道下属所有社区治理能力汇总 (平均值) ", 5, true),
-    SHE_QU_XIA_JI_SYWGFWNLDFPJZ("shequxiajisywgfwnldfpjz","社区下级所有网格服务能力得分(平均值) ",5),
+    JIE_DAO_XIA_SHU_SQFWNLDFPYZ("jiedaoxiashusqfwnldfpjz", "街道下属社区服务能力得分 (平均值) ", 5, true),
-    JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ("jiedaoxiashusysqdjnlhzpjz","街道下属所有社区党建能力汇总（平均值）",5),
+    QU_XIA_SHU_JIE_DFWNLHZPJZ("quxiashujiedfwnlhzpjz", "区下属街道服务能力汇总（平均值）", 5, true),
-    JIE_DAO_XIA_SHU_SYSQZLNLHZ("jiedaoxiashusysqzlnlhz","街道下属所有社区治理能力汇总 (平均值) ",5),
+    QU_XIA_JI_JIE_DDJNLHZPJZ("quxiajijieddjnlhzpjz", "区下级街道党建能力汇总（平均值）", 5, true),
-    JIE_DAO_XIA_SHU_SQFWNLDFPYZ("jiedaoxiashusqfwnldfpjz","街道下属社区服务能力得分 (平均值) ",5),
+    SUO_YOU_JIE_DAO_ZLNLPJZ("suoyoujiedaozlnlpjz", "所有街道治理能力（平均值）", 5, true),
-    QU_XIA_SHU_JIE_DFWNLHZPJZ("quxiashujiedfwnlhzpjz","区下属街道服务能力汇总（平均值）",5),
+    SUO_YOU_ZHI_SHU_BMZLNLPJZ("suoyouzhishubmzlnlpjz", "所有直属部门治理能力（平均值）", 5, true),
-    QU_XIA_JI_JIE_DDJNLHZPJZ("quxiajijieddjnlhzpjz","区下级街道党建能力汇总（平均值）",5),
-    SUO_YOU_JIE_DAO_ZLNLPJZ("suoyoujiedaozlnlpjz","所有街道治理能力（平均值）",5),
-    SUO_YOU_ZHI_SHU_BMZLNLPJZ("suoyouzhishubmzlnlpjz","所有直属部门治理能力（平均值）",5),
     ;
 
+    /**
+     * code
+     */
     private String code;
+    /**
+     * name
+     */
     private String name;
+    /**
+     * 等级
+     */
     private Integer level;
+    /**
+     * 是否是平均值
+     */
+    private Boolean isAvgIndex;
 
 
-    IndexCodeEnum(String code, String name, Integer level) {
+    IndexCodeEnum(String code, String name, Integer level, Boolean isAvgIndex) {
         this.code = code;
         this.name = name;
         this.level = level;
+        this.isAvgIndex = isAvgIndex;
     }
 
     public static IndexCodeEnum getEnum(String code) {
@@ -58,6 +71,16 @@ public enum IndexCodeEnum {
         return null;
     }
 
+    public static boolean isAvgIndex(String code) {
+        IndexCodeEnum[] values = IndexCodeEnum.values();
+        for (IndexCodeEnum value : values) {
+            if (code != null && value.getCode().equals(code)) {
+                return value.isAvgIndex;
+            }
+        }
+        return false;
+    }
+
 
     public String getCode() {
         return code;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -375,7 +375,8 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
                     ScoreConstants.MAX_SCORE,
                     Correlation.getCorrelation(index.getCorrelation())
             );
-            IndexInputVO indexInputVO = new IndexInputVO(index.getIndexCode(), index.getAllParentIndexCode(), new ArrayList<>(), index.getThreshold(), index.getWeight(), scoreCalculator);
+
+            IndexInputVO indexInputVO = new IndexInputVO(index.getIndexCode(), index.getAllParentIndexCode(), new ArrayList<>(), index.getThreshold(), index.getWeight(), IndexCodeEnum.isAvgIndex(index.getIndexCode()), scoreCalculator);
             map.put(index.getIndexCode(), indexInputVO);
         }
         return map;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java

@@ -375,6 +375,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
                     index.getThreshold(),
 //                    new BigDecimal("-1"),   //FOR TEST
                     index.getWeight(),
+                    IndexCodeEnum.isAvgIndex(index.getIndexCode()),
                     scoreCalculator);
             map.put(index.getIndexCode(), indexInputVO1);
         }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@@ -494,6 +494,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     index.getThreshold(),
 //                                                         new BigDecimal("-1"),//FOR TEST
                     index.getWeight(),
+                    IndexCodeEnum.isAvgIndex(index.getIndexCode()),
                     scoreCalculator);
             map.put(index.getIndexCode(), indexInputVO1);
         }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -129,7 +129,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -155,7 +155,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -202,7 +202,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -228,7 +228,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -275,7 +275,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -300,7 +300,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@@ -127,7 +127,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -153,7 +153,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -200,7 +200,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -219,7 +219,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -268,7 +268,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                             SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@@ -131,7 +131,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -156,7 +156,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldName))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -203,7 +203,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -229,7 +229,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -276,7 +276,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }
@@ -301,7 +301,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                             SampleValue s = new SampleValue((String) c.get(IndexCalConstant.AGENCY_ID), new BigDecimal(String.valueOf(c.get(fieldNameByIndexCode))));
                             index1SampleValues.add(s);
                         });
-                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), sc1);
+                        IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);
                     });
                 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java

@@ -57,7 +57,13 @@ public class BatchScoreCalculator {
             for (SampleValue vo : indexValueVOs) {
                 String sampleId = vo.getSampleId();
                 //归一后的值
-                BigDecimal normalizeValue = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold));
+                BigDecimal normalizeValue;// = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold));
+                //如果不需要归一 则 直接value*权重
+                if (idx.isScore()) {
+                    normalizeValue = getFinalSampleValue(vo.getSampleValue(), threshold);
+                } else {
+                    normalizeValue = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold));
+                }
                 BigDecimal score = normalizeValue.multiply(weight).setScale(6, RoundingMode.HALF_UP);
                 CalculateResult result = scoreCountOfSamples.get(sampleId);
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/IndexInputVO.java

@@ -39,5 +39,10 @@ public class IndexInputVO<T extends Number> implements Serializable {
      */
     private BigDecimal weight;
 
+    /**
+     * 是否是分数 如果是分数 直接不用计算 乘以权重即可
+     */
+    private boolean isScore;
+
     private ScoreCalculator<T> scoreCalculator;
 }

epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/DemoScoreCal.java

@@ -76,8 +76,8 @@ public class DemoScoreCal {
         List<SampleValue<Integer>> index2SampleValues = Arrays.asList(new SampleValue<>("id1", 1), new SampleValue<>("id2", 8), new SampleValue<>("id3", 3));
 
         // 每个指标的信息，包括样本列表，权重，指标标记
-        IndexInputVO<Integer> index1VO = new IndexInputVO<>("aaa", "a:bbb2", index1SampleValues, new BigDecimal(10), new BigDecimal(1), sc1);
+        IndexInputVO<Integer> index1VO = new IndexInputVO<>("aaa", "a:bbb2", index1SampleValues, new BigDecimal(10), new BigDecimal(1), false, sc1);
-        IndexInputVO<Integer> index2VO = new IndexInputVO<>("bbb", "a:bbb2", index2SampleValues, new BigDecimal(10), new BigDecimal(1), sc2);
+        IndexInputVO<Integer> index2VO = new IndexInputVO<>("bbb", "a:bbb2", index2SampleValues, new BigDecimal(10), new BigDecimal(1), false, sc2);
 
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO);
 
@@ -102,8 +102,8 @@ public class DemoScoreCal {
         List<SampleValue> index2SampleValues = Arrays.asList(new SampleValue<>("id1", new BigDecimal(1)), new SampleValue<>("id2", new BigDecimal(8)), new SampleValue<>("id3", new BigDecimal(3)));
 
         // 每个指标的信息，包括样本列表，权重，指标标记
-        IndexInputVO index1VO = new IndexInputVO("aaa", "a:aaa", index1SampleValues, new BigDecimal(6), new BigDecimal(1), sc1);
+        IndexInputVO index1VO = new IndexInputVO("aaa", "a:aaa", index1SampleValues, new BigDecimal(6), new BigDecimal(1), false, sc1);
-        IndexInputVO index2VO = new IndexInputVO("bbb", "b:bbb", index2SampleValues, new BigDecimal(6), new BigDecimal(1), sc2);
+        IndexInputVO index2VO = new IndexInputVO("bbb", "b:bbb", index2SampleValues, new BigDecimal(6), new BigDecimal(1), false, sc2);
 
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO);
 
@@ -161,10 +161,10 @@ public class DemoScoreCal {
 
 
         // 每个指标的信息，包括样本列表，权重，指标标记
-        IndexInputVO index1VO = new IndexInputVO("aaa1", "a:bbb2", index1SampleValues, new BigDecimal(-1), new BigDecimal(0.2), sc1);
+        IndexInputVO index1VO = new IndexInputVO("aaa1", "a:bbb2", index1SampleValues, new BigDecimal(-1), new BigDecimal(0.2), false, sc1);
-        IndexInputVO index2VO = new IndexInputVO("aaa2", "a:bbb2", index1SampleValues2, new BigDecimal(-1), new BigDecimal(0.15), sc2);
+        IndexInputVO index2VO = new IndexInputVO("aaa2", "a:bbb2", index1SampleValues2, new BigDecimal(-1), new BigDecimal(0.15), false, sc2);
-        IndexInputVO index3VO = new IndexInputVO("aaa3", "a:bbb2", index1SampleValues3, new BigDecimal(-1), new BigDecimal(0.15), sc3);
+        IndexInputVO index3VO = new IndexInputVO("aaa3", "a:bbb2", index1SampleValues3, new BigDecimal(-1), new BigDecimal(0.15), false, sc3);
-        IndexInputVO index4VO = new IndexInputVO("aaa4", "a:bbb2", index1SampleValues4, new BigDecimal(-1), new BigDecimal(0.5), sc4);
+        IndexInputVO index4VO = new IndexInputVO("aaa4", "a:bbb2", index1SampleValues4, new BigDecimal(-1), new BigDecimal(0.5), false, sc4);
 
 
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO, index3VO, index4VO);
@@ -234,10 +234,10 @@ public class DemoScoreCal {
 
 
         // 每个指标的信息，包括样本列表，权重，指标标记
-        IndexInputVO index1VO = new IndexInputVO("aaa1", "a:bbb2", index1SampleValues, new BigDecimal(-1), new BigDecimal(0.3), sc1);
+        IndexInputVO index1VO = new IndexInputVO("aaa1", "a:bbb1", index1SampleValues, new BigDecimal(-1), new BigDecimal("0.3"), false, sc1);
-        IndexInputVO index2VO = new IndexInputVO("aaa2", "a:bbb2", index1SampleValues2, new BigDecimal(-1), new BigDecimal(0.2), sc2);
+        IndexInputVO index2VO = new IndexInputVO("aaa2", "a:bbb2", index1SampleValues2, new BigDecimal(-1), new BigDecimal("0.2"), false, sc2);
-        IndexInputVO index3VO = new IndexInputVO("aaa3", "a:bbb2", index1SampleValues3, new BigDecimal(-1), new BigDecimal(0.2), sc3);
+        IndexInputVO index3VO = new IndexInputVO("aaa3", "a:bbb3", index1SampleValues3, new BigDecimal(-1), new BigDecimal("0.2"), false, sc3);
-        IndexInputVO index4VO = new IndexInputVO("aaa4", "a:bbb2", index1SampleValues4, new BigDecimal(0.6), new BigDecimal(0.3), sc4);
+        IndexInputVO index4VO = new IndexInputVO("aaa4", "a:bbb4", index1SampleValues4, new BigDecimal(0.6), new BigDecimal("0.3"), false, sc4);
 
 
         List<IndexInputVO> indexInputVOS = Arrays.asList(index1VO, index2VO, index3VO, index4VO);
@@ -250,7 +250,9 @@ public class DemoScoreCal {
 
         System.err.println("----------------11111111----------------");
         result2.forEach((key, value) -> {
-            System.out.println(key.concat("的得分为:").concat(value.toString()));
+            System.out.println(key.concat("的总得分为:") + value.getTotalScore());
+            //System.out.println(JSON.toJSONString(indexInputVOS));
+            value.getDetails().forEach(o -> System.out.println(JSON.toJSONString(o)));
         });
         System.err.println("-----------------2222222222---------------");
     }