From f2bb21bf512a91df1cb22b99508844e12aa8df1b Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 12 Jan 2021 16:41:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=20=E5=85=88=E9=94=8B?= =?UTF-8?q?=E6=A8=A1=E8=8C=83=E5=80=9F=E5=8F=A3=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=AE=AE=E4=BA=8B=E6=80=BB=E6=95=B0=E5=92=8C?= =?UTF-8?q?=E4=BD=86=E4=B9=9F=E5=8D=A0=E6=AF=94=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dto/result/FineExampleResultDTO.java | 9 +++++++++ .../screen/impl/PartyMemberLeadServiceImpl.java | 1 + .../resources/mapper/screen/ScreenPioneerDataDao.xml | 6 ++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java index b522e3166c..d8b33c9d12 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/FineExampleResultDTO.java @@ -78,4 +78,13 @@ public class FineExampleResultDTO implements Serializable { * 党员发布议题数占比 */ private String publishIssueRatio = "0.00%"; + + /** + * 01.12新增：PLAT_ISSUE_TOTAL 平台参与议事总数 + */ + private Integer platIssueTotal; + /** + * PLAT_JOIN PARTY_RATIO 平台参与议事的党员占比 + */ + private String platJoinPartyRatio = "0.00%"; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java index 77f8a4c7e1..941a294e49 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java @@ -67,6 +67,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { fineExampleResultDTO.setResolvedProjectRatio(this.getRatio(fineExampleResultDTO.getResolvedProjectRatioA())); fineExampleResultDTO.setTopicRatio(this.getRatio(fineExampleResultDTO.getTopicRatioA())); fineExampleResultDTO.setShiftProjectRatio(this.getRatio(fineExampleResultDTO.getShiftProjectRatioA())); + fineExampleResultDTO.setPlatJoinPartyRatio(this.getRatio(Double.valueOf(fineExampleResultDTO.getPlatJoinPartyRatio()))); return fineExampleResultDTO; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml index 992c347f9b..505ca018a8 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml @@ -15,7 +15,9 @@ resolved_project_total AS resolvedProjectTotal, resolved_project_ratio AS resolvedProjectRatioA, publish_issue_total AS publishIssueTotal, - publish_issue_ratio AS publishIssueRatioA + publish_issue_ratio AS publishIssueRatioA, + PLAT_ISSUE_TOTAL AS platIssueTotal, + PLAT_JOIN_PARTY_RATIO AS platJoinPartyRatio FROM screen_pioneer_data WHERE @@ -24,4 +26,4 @@ ORDER BY data_end_time DESC LIMIT 1 - \ No newline at end of file +