From 911fc323933135a99312046c1da852fa1cb054c9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 24 Sep 2020 17:16:52 +0800 Subject: [PATCH 1/2] =?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 --- .../extract/toscreen/PartyGuideService.java | 18 +++++++++++++ .../toscreen/impl/PartyGuideServiceImpl.java | 26 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/PartyGuideService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PartyGuideServiceImpl.java 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 new file mode 100644 index 0000000000..09dafb2a6a --- /dev/null +++ b/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); + +} 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 new file mode 100644 index 0000000000..e820b39396 --- /dev/null +++ b/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; + } +} From 1c29fad1a32e621b6d870d8fbf1b663c7bb57095 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 24 Sep 2020 17:36:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/extract/form/IssueMainDailyFormDTO.java | 5 +++++ .../com/epmet/dto/extract/result/IssueInfoResultDTO.java | 5 +++++ .../evaluationindex/extract/FactOriginIssueMainDailyDao.xml | 2 ++ .../src/main/resources/mapper/issue/StatsIssueDao.xml | 5 ++--- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java index 0f4fccc58f..5cbaa9f748 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java +++ b/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; + /** * 创建话题用户身份标识 */ diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java index 4dd3bcac07..b09aefb549 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java +++ b/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; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml index 5e3b556b12..307c371eab 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml +++ b/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}, diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml index e226e3964d..eeb0458c56 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml @@ -209,9 +209,8 @@