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/dto/extract/form/IssueMainDailyFormDTO.java

@@ -91,6 +91,11 @@ public class IssueMainDailyFormDTO implements Serializable {
      */
     private String issueStatus;
 
+    /**
+     * 关闭状态
+     */
+    private String resolveType;
+
     /**
      * 创建话题用户身份标识
      */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java

@@ -47,4 +47,9 @@ public class IssueInfoResultDTO implements Serializable {
      * 用户ID
      */
     private String userId;
+
+    /**
+     * 关闭状态
+     */
+    private String resolveType;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/PartyGuideService.java

@@ -0,0 +1,18 @@
+package com.epmet.service.evaluationindex.extract.toscreen;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/24 5:05 下午
+ */
+public interface PartyGuideService {
+
+    /**
+     * @Description  党建引领抽取
+     * @param customerId
+     * @param dateId
+     * @author zxc
+     * @date 2020/9/24 5:10 下午
+     */
+    Boolean partyGuideExtract(String customerId,String dateId);
+
+}

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

@@ -0,0 +1,26 @@
+package com.epmet.service.evaluationindex.extract.toscreen.impl;
+
+import com.epmet.service.evaluationindex.extract.toscreen.PartyGuideService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/24 5:06 下午
+ */
+@Service
+@Slf4j
+public class PartyGuideServiceImpl implements PartyGuideService {
+
+    /**
+     * @Description  党建引领抽取
+     * @param customerId
+     * @param dateId
+     * @author zxc
+     * @date 2020/9/24 5:10 下午
+     */
+    @Override
+    public Boolean partyGuideExtract(String customerId, String dateId) {
+        return null;
+    }
+}

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

@@ -22,6 +22,7 @@
         PIDS,
         AGENCY_ID,
         ISSUE_STATUS,
+        RESOLVE_TYPE,
         TOPIC_USER_IS_PARTY,
         DEL_FLAG,
         REVISION,
@@ -48,6 +49,7 @@
                 #{item.pids},
                 #{item.agencyId},
                 #{item.issueStatus},
+                #{item.resolveType},
                 #{item.topicUserIsParty},
                 #{item.delFlag},
                 #{item.revision},

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -209,9 +209,8 @@
     <select id="selectIssueInfo" resultType="com.epmet.dto.extract.result.IssueInfoResultDTO">
         SELECT
             ID AS issueId,
-            (case when RESOLVE_TYPE = 'resolved' then 'closed_resolved'
-                  when RESOLVE_TYPE = 'unresolved' then 'closed_unresolved'
-                  else ISSUE_STATUS end ) AS ISSUE_STATUS,
+            ISSUE_STATUS,
+            RESOLVE_TYPE as resolveType,
             SOURCE_ID AS topicId,
             CUSTOMER_ID,
             GRID_ID,