From de33afd6141bff05cb167c5339c4df4dd88a0759 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 28 Sep 2020 14:46:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=BC=95=E9=A2=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/extract/toscreen/PartyGuideService.java | 6 +++---
 .../extract/toscreen/impl/PartyGuideServiceImpl.java        | 3 ++-
 .../extract/toscreen/impl/ScreenExtractServiceImpl.java     | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/PartyGuideService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/PartyGuideService.java
index 2628a50ced..2d8ac15142 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/PartyGuideService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/PartyGuideService.java
@@ -1,6 +1,6 @@
 package com.epmet.service.evaluationindex.extract.toscreen;
 
-import com.epmet.dto.extract.form.ScreenExtractFormDTO;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 
 /**
  * @Author zxc
@@ -10,10 +10,10 @@ public interface PartyGuideService {
 
     /**
      * @Description  党建引领抽取
-     * @param screenExtractFormDTO
+     * @param formDTO
      * @author zxc
      * @date 2020/9/24 5:10 下午
      */
-    Boolean partyGuideExtract(ScreenExtractFormDTO screenExtractFormDTO);
+    Boolean partyGuideExtract(ExtractScreenFormDTO formDTO);
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyGuideServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyGuideServiceImpl.java
index b58a38ee7e..48167f4263 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyGuideServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyGuideServiceImpl.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.ScreenConstant;
+import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.extract.form.ScreenExtractFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyBranchDataFormDTO;
 import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
@@ -64,7 +65,7 @@ public class PartyGuideServiceImpl implements PartyGuideService {
      * @date 2020/9/24 5:10 下午
      */
     @Override
-    public Boolean partyGuideExtract(ScreenExtractFormDTO screenExtractFormDTO) {
+    public Boolean partyGuideExtract(ExtractScreenFormDTO screenExtractFormDTO) {
         int pageNo = NumConstant.ONE;
         int pageSize = NumConstant.ONE_HUNDRED;
         List<String> customerIds = new ArrayList<>();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
index 5712789d6c..946c965fde 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
@@ -29,6 +29,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     @Autowired
     private PartyBaseInfoService partyBaseInfoService;
     @Autowired
+    private PartyGuideService partyGuideService;
+    @Autowired
     private PioneerDataExtractService pioneerDataExtractService;
     @Autowired
     private PublicPartExtractService publicPartExtractService;
@@ -140,5 +142,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         orgRankExtractService.extractGridData(customerId, monthId);
         orgRankExtractService.extractCommunityData(customerId, monthId);
         orgRankExtractService.extractStreetData(customerId, monthId);
+
+        // 党建引领 screen_party_branch_data,screen_party_link_masses_data
+        partyGuideService.partyGuideExtract(formDTO);
     }
 }