From 5dd57ff22ac6aaaf9c292e6a955e94289fddfe29 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 31 May 2021 09:42:18 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=B9=B3=E5=9D=87=E5=80=BC=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E5=88=86=E7=BB=84=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/evaluationindex/indexcal/GridScoreDao.java    | 11 +++++++++++
 .../impl/IndexCalculateCommunityServiceImpl.java      |  1 +
 .../mapper/evaluationindex/indexcal/GridScoreDao.xml  |  4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
index c2f6dff243..85a9b113fc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
@@ -77,6 +77,17 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
      * @date 2020/8/28 3:20 下午
      */
     List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
+
+    /**
+     * @Description  【社区-community】下级三大能力平均值
+     * @Param customerId
+     * @Param monthId
+     * @Param indexCode
+     * @Param quarterId
+     * @Param yearId
+     * @author zxc
+     * @date 2021/5/31 9:34 上午
+     */
     List<SubGridAvgResultDTO> selectSubGridAvgScoreNew(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
index 336ce7a7e1..1f279c4076 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
@@ -400,6 +400,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     });
                 }
             } else {
+                // 活动组织次数
                 List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapNew(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL,quarterId,yearId);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
                     log.warn(IndexCalConstant.COMMUNITY_SERVICE_ABILITY_NULL);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
index 807a7b288e..2c95faeb7a 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
@@ -201,6 +201,8 @@
           AND sca.AREA_CODE != #{areaCode}
         GROUP BY figc.agency_id
     </select>
+
+    <!-- 【社区-community】下级三大能力平均值 -->
     <select id="selectSubGridAvgScoreNew" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">
         SELECT
             sca.agency_id AS agencyId,
@@ -221,7 +223,7 @@
         WHERE sca.DEL_FLAG = '0'
           AND sca.level = 'community'
           AND sca.customer_id = #{customerId}
-        GROUP BY figc.agency_id
+        GROUP BY sca.agency_id
     </select>
 
     <select id="selectSubGridAvgScoreByAreaCodeNew" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">

From f9ed86ef96ab190e1313b93b3b888ec3b4adcd87 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 31 May 2021 09:48:55 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=A1=97=E9=81=93=20=E4=B8=89=E5=A4=A7?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=AE=A1=E7=AE=97=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexcal/impl/IndexCalculateStreetServiceImpl.java           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
index ccec3637fd..011694dbb8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
@@ -403,6 +403,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     });
                 }
             } else {
+                // 活动组织次数
                 List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapNew(customerId, monthId,IndexCalConstant.STREET_LEVEL,quarterId,yearId);
                 if (CollectionUtils.isEmpty(communityActivityCountList)) {
                     log.warn(IndexCalConstant.STREET_SERVICE_ABILITY_NULL);

From 952f4e862ce650ac1de37448037c6d3164c08326 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 31 May 2021 10:37:50 +0800
Subject: [PATCH 3/4] ..

---
 .../IndexCalculateDistrictServiceImpl.java    | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index 013ca207be..14f443ec4e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -237,11 +237,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     subPartyAvgList.forEach(party -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
-                            if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
-                                SampleValue s = new SampleValue(c.getParentId(), c.getScore());
-                                index1SampleValues.add(s);
-                            }
+                            pid.put(c.getAgencyId(), c.getParentId());
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            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(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
@@ -322,11 +320,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     governAvg.forEach(avg -> {
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
-                            if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
-                                SampleValue s = new SampleValue(c.getParentId(), c.getScore());
-                                index1SampleValues.add(s);
-                            }
+                            pid.put(c.getAgencyId(), c.getParentId());
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            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(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
@@ -407,11 +403,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         BigDecimalScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
-                            if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
-                                SampleValue s = new SampleValue(c.getParentId(), c.getScore());
-                                index1SampleValues.add(s);
-                            }
+                            pid.put(c.getAgencyId(), c.getParentId());
+                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            index1SampleValues.add(s);
                         });
                         IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
                         indexInputVOS.add(index1VO);

From f2749b6b0d666df847ced13e7be15dfff8dd8e76 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 31 May 2021 10:49:57 +0800
Subject: [PATCH 4/4] ..

---
 .../indexcal/impl/IndexCalculateDistrictServiceImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
index 14f443ec4e..dcec17a0c8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
@@ -238,7 +238,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
                             pid.put(c.getAgencyId(), c.getParentId());
-                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
@@ -321,7 +321,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
                             pid.put(c.getAgencyId(), c.getParentId());
-                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
                         BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
@@ -404,7 +404,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
                             pid.put(c.getAgencyId(), c.getParentId());
-                            SampleValue s = new SampleValue(c.getParentId(), c.getScore());
+                            SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
                             index1SampleValues.add(s);
                         });
                         IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);