Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java

@@ -1,7 +1,5 @@
 package com.epmet.datareport.controller.fact;
 
-import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.fact.FactIndexService;
@@ -40,7 +38,7 @@ public class FactIndexController {
 
     /**
      * @param formDTO
-     * @Description 按月份查询各项能力分数
+     * @Description 按月份查询本级及下级分数
      * @author sun
      */
     @PostMapping("index/scorelist")

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencyScoreDao.java

@@ -49,7 +49,7 @@ public interface FactIndexAgencyScoreDao {
      * @Description 查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
      * @author sun
      */
-    List<ScoreListResultDTO> selectScoreList(ScoreListFormDTO formDTO);
+    List<ScoreListResultDTO> selectAgencyWeightScoreList(ScoreListFormDTO formDTO);
 
     /**
      * @param formDTO

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunityScoreDao.java

@@ -49,7 +49,7 @@ public interface FactIndexCommunityScoreDao {
      * @Description 查询社区级组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
      * @author sun
      */
-    List<ScoreListResultDTO> selectCommunityScoreList(ScoreListFormDTO formDTO);
+    List<ScoreListResultDTO> selectCommunityWeightScoreList(ScoreListFormDTO formDTO);
 
     /**
      * @param formDTO

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridScoreDao.java

@@ -49,7 +49,7 @@ public interface FactIndexGridScoreDao {
      * @Description 分别查网格某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
      * @author sun
      */
-    List<ScoreListResultDTO> selectGridScoreList(ScoreListFormDTO formDTO);
+    List<ScoreListResultDTO> selectGridWeightScoreList(ScoreListFormDTO formDTO);
 
     /**
      * @param formDTO

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -181,11 +181,11 @@ public class FactIndexServiceImpl implements FactIndexService {
             //区县级、乡镇街道级
             if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
                 //3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
-                resultList = factIndexAgencyScoreDao.selectScoreList(formDTO);
+                resultList = factIndexAgencyScoreDao.selectAgencyWeightScoreList(formDTO);
                 //社区级
             } else if ("community".equals(agency.getLevel())) {
                 //3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
-                resultList = factIndexCommunityScoreDao.selectCommunityScoreList(formDTO);
+                resultList = factIndexCommunityScoreDao.selectCommunityWeightScoreList(formDTO);
             } else {
                 //throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
                 return resultList;
@@ -194,7 +194,7 @@ public class FactIndexServiceImpl implements FactIndexService {
             //4.网格层级数据
         } else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
             //4-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
-            resultList = factIndexGridScoreDao.selectGridScoreList(formDTO);
+            resultList = factIndexGridScoreDao.selectGridWeightScoreList(formDTO);
         } else {
             throw new RenException(String.format("按月份查询各项能力分数,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
         }

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml

@@ -21,12 +21,12 @@
             fact.month_id ASC
     </select>
 
-    <select id="selectScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
+    <select id="selectAgencyWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
         SELECT
             fact.index_code AS "indexCode",
-            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score, 1) AS "subAgencyScore"
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
         FROM
             fact_index_agency_score fact
         INNER JOIN fact_index_agency_self_sub_score self ON fact.agency_id = self.agency_id
@@ -45,8 +45,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(self.self_score*self.SELF_WEIGHT, 1) AS "agencyScore",
+            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*self.SUB_WEIGHT, 1) AS "subAgencyScore",
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"
         FROM
             fact_index_agency_score fact

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml

@@ -21,12 +21,12 @@
             fact.month_id ASC
     </select>
 
-    <select id="selectCommunityScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
+    <select id="selectCommunityWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
         SELECT
             fact.index_code AS "indexCode",
-            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score, 1) AS "subAgencyScore"
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
         FROM
             fact_index_community_score fact
         INNER JOIN fact_index_community_self_sub_score self ON fact.agency_id = self.agency_id
@@ -45,8 +45,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(self.self_score*self.SELF_WEIGHT, 1) AS "agencyScore",
+            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*self.SUB_WEIGHT, 1) AS "subAgencyScore",
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"
         FROM
             fact_index_community_score fact

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml

@@ -21,12 +21,12 @@
             fact.month_id ASC
     </select>
 
-    <select id="selectGridScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
+    <select id="selectGridWeightScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
         SELECT
             fact.index_code AS "indexCode",
-            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score, 1) AS "subAgencyScore"
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore"
         FROM
             fact_index_grid_score fact
         INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id
@@ -46,8 +46,8 @@
         SELECT
             fact.month_id AS "monthId",
             ROUND(fact.score*fact.WEIGHT, 1) AS "indexTotal",
-            ROUND(self.self_score*self.SELF_WEIGHT, 1) AS "agencyScore",
+            ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
-            ROUND(self.sub_score*self.SUB_WEIGHT, 1) AS "subAgencyScore",
+            ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
             fact.index_code AS "indexCode"
         FROM
             fact_index_grid_score fact