Merge branch 'dev_screen_data' into dev_temp

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<>();

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">