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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -710,7 +710,13 @@ public class DemoController {
         return new Result();
     }
 
+    @Autowired
+    private PublicPartExtractService publicPartExtractService;
+    @PostMapping("extractTotalDataMonthly")
+    public void extractTotalDataMonthly(@RequestBody ExtractScreenFormDTO formDTO){
+        publicPartExtractService.extractTotalDataMonthly(formDTO);
 
+    }
 
 
 }

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

@@ -4,7 +4,6 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ExtractConstant;
 import com.epmet.constant.ProjectEvaluateConstant;
-import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
 import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.GridIssueCountResultDTO;
 import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
@@ -48,8 +47,6 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
     @Autowired
     private IssueExtractService issueExtractService;
     @Autowired
-    private FactIndexGovrnAblityGridMonthlyDao governAbilityDao;
-    @Autowired
     private FactOriginProjectMainDailyService projectMainService;
     @Autowired
     private FactOriginProjectLogDailyService projectLogService;
@@ -312,7 +309,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
                                 project.setScore(ProjectEvaluateConstant.PERFECT);
                                 break;
                             default:
-                                log.warn("calGridIndexGovernAbility orther projectEvaluate,actionCode:{}", project.getActionCode());
+                                log.warn("calGridIndexGovernAbility other projectEvaluate,actionCode:{}", project.getActionCode());
                         }
                     });
                     Integer projectAllScore = projectList.stream().mapToInt(ProjectEvaluateResultDTO::getScore).sum();

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -362,7 +362,7 @@
         grid.DEL_FLAG = '0'
         AND grid.CUSTOMER_ID = #{customerId}
         ) gridInfo ON project.GRID_ID = gridInfo.dimGridId
-        LEFT JOIN ( SELECT PROJECT_ID, COUNT( DISTINCT ORG_ID ) AS reOrg FROM fact_origin_project_org_period_daily WHERE DEL_FLAG = '0' AND CUSTOMER_ID = '3ef7e4bb195eb9e622d68b52509aa940' GROUP BY PROJECT_ID ) relation ON project.ID = relation.PROJECT_ID -- 处理次数
+        LEFT JOIN ( SELECT PROJECT_ID, COUNT( DISTINCT ORG_ID ) AS reOrg FROM fact_origin_project_org_period_daily WHERE DEL_FLAG = '0' AND CUSTOMER_ID = = #{customerId} GROUP BY PROJECT_ID ) relation ON project.ID = relation.PROJECT_ID
         LEFT JOIN (
         SELECT
         PROJECT_ID,