From bbbce2d6ce4870fa75ff5df15acf32e9b7211b2f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 11 Sep 2020 10:46:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=81=94=E7=B3=BB=E7=BE=A4=E4=BC=97+?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=AE=AE=E4=BA=8B=20=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=B9=B3=E5=9D=87=E5=80=BC=EF=BC=8C=E5=8E=BB=E6=8E=89group=20b?=
 =?UTF-8?q?y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
index 7f6505b70a..4d253f3d76 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml
@@ -55,8 +55,6 @@
             AND m.MONTH_ID = #{monthId}
             AND m.GRID_ID = #{gridId}
             and m.INDEX_CODE='lianxiqunzhong'
-         GROUP BY
-            m.GRID_ID
     </select>
 
     <!-- 获取网格内党员的联系群众能力考评分（平均值）的最大值，最小值   -->
@@ -101,8 +99,6 @@
             AND m.MONTH_ID = #{monthId}
             AND m.GRID_ID = #{gridId}
             and m.INDEX_CODE='canyuyishi'
-         GROUP BY
-            m.GRID_ID
     </select>
 
     <insert id="insertBatch">

From 03581bc245848d597651e1374dfafadb6359dc53 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 11 Sep 2020 10:52:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?subAgencyIndexRank=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=BA=90=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/evaluationindex/screen/impl/IndexServiceImpl.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
index 4d23ca4bca..29fc46e738 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
@@ -181,6 +181,7 @@ public class IndexServiceImpl implements IndexService {
         return subAgencyIndexRankResultDTOS;
     }
 
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public List<SubAgencyIndexRankResultDTO> anNingSubAgencyIndexRank(AnNingSubAgencyIndexRankFormDTO formDTO) {
         List<SubAgencyIndexRankResultDTO> subAgencyIndexRankResultDTOS = new ArrayList<>();