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

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/ExtractConstant.java

@@ -20,6 +20,8 @@ public interface ExtractConstant {
 
     String SHIFT_PROJECT = "shift_project";
 
+    String CLOSE = "close";
+
     String CLOSED = "closed";
 
     String GRID_ORG_TYPE = "grid";

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java

@@ -275,7 +275,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
             });
         }
         //网格办结项目数
-        List<GridProjectClosedTotalResultDTO> gridProjectClosedTotalList = projectMainService.selectGridClosedProject(customerId, monthId, ExtractConstant.CLOSED);
+        List<GridProjectClosedTotalResultDTO> gridProjectClosedTotalList = projectMainService.selectGridClosedProject(customerId, monthId, ExtractConstant.CLOSE);
         //网格吹哨部门准确率  【没被退回的项目数/项目总数 】
         List<NotReturnProjectResultDTO> notReturnProjectList = projectLogService.selectNotReturnProject(customerId, monthId, ExtractConstant.RETURN_ACTION_CODE, ExtractConstant.GRID_ORG_TYPE);
         if (!CollectionUtils.isEmpty(gridIssueShiftProjectRatio) && !CollectionUtils.isEmpty(notReturnProjectList)){