治理指数数据查询接口修改

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1300,22 +1300,22 @@ public class DataStatsServiceImpl implements DataStatsService {
         }
 
         //1.查询组织直属网格列表【网格维度】
-        List<DimGridEntity> gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+        List<ScreenCustomerGridDTO> gridList = indexService.getSubGridList(formDTO.getAgencyId());
         if (gridList.size() < NumConstant.ONE) {
             return resultList;
         }
-        List<String> gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+        List<String> gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
 
         //2.按日期查找组织直属网格事件治理指数列表
         List<GridGovrnResultDTO> list = dataStatsDao.getGridGovern(gridIds, formDTO.getDateId());
 
         //3.封装数据
-        for (DimGridEntity gr : gridList) {
+        for (ScreenCustomerGridDTO gr : gridList) {
             GridGovrnResultDTO dto = new GridGovrnResultDTO();
-            dto.setGridId(gr.getId());
+            dto.setGridId(gr.getGridId());
             dto.setGridName(gr.getGridName());
             for (GridGovrnResultDTO re : list) {
-                if (gr.getId().equals(re.getGridId())) {
+                if (gr.getGridId().equals(re.getGridId())) {
                     dto.setProblemResolvedCount(re.getProblemResolvedCount());
                     dto.setGroupSelfGovernRatio(re.getGroupSelfGovernRatio());
                     dto.setGridSelfGovernRatio(re.getGridSelfGovernRatio());

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenGovernRankDataDailyDao.xml

@@ -52,7 +52,14 @@
             0 AS RESPONSE_RATIO,
             0 AS RESOLVED_RATIO,
             0 AS GOVERN_RATIO,
-            0 AS SATISFACTION_RATIO
+            0 AS SATISFACTION_RATIO,
+            0 AS RESPONSE_COUNT,
+            0 AS TRANSFER_COUNT,
+            0 AS RESOLVED_COUNT,
+            0 AS CLOSED_COUNT,
+            0 AS GOVERN_COUNT,
+            0 AS SATISFACTION_COUNT,
+            0 AS CLOSED_PROJECT_COUNT
         FROM
             screen_customer_agency
         WHERE
@@ -69,7 +76,14 @@
             0 AS RESPONSE_RATIO,
             0 AS RESOLVED_RATIO,
             0 AS GOVERN_RATIO,
-            0 AS SATISFACTION_RATIO
+            0 AS SATISFACTION_RATIO,
+            0 AS RESPONSE_COUNT,
+            0 AS TRANSFER_COUNT,
+            0 AS RESOLVED_COUNT,
+            0 AS CLOSED_COUNT,
+            0 AS GOVERN_COUNT,
+            0 AS SATISFACTION_COUNT,
+            0 AS CLOSED_PROJECT_COUNT
         FROM
             screen_customer_grid
         WHERE