From 3250f9ab4e369328857b364091904df6ada53c73 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Sat, 10 Oct 2020 09:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=9C=AA=E7=94=A8import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/DemoController.java  | 6 ++++++
 .../extract/dataToIndex/impl/CalGridIndexServiceImpl.java   | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index eeb5758d08..c5d269e36f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/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);
 
+    }
 
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
index 4610455b81..858b3d6ddd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalGridIndexServiceImpl.java
+++ b/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();