From 990a81c5f9bfa3d5c1c7c8cc3b2b52e54f298f88 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 1 Sep 2020 10:57:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=81=94=E7=B3=BB=E7=BE=A4?= =?UTF-8?q?=E4=BC=97=E6=9F=B1=E7=8A=B6=E5=9B=BE=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=80=BB=E5=92=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ContactMassLineChartResultDTO.java | 10 ++++++++++ .../screen/impl/PartyMemberLeadServiceImpl.java | 2 ++ 2 files changed, 12 insertions(+) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java index e57b0cc54f..17e31e33ee 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java @@ -28,4 +28,14 @@ public class ContactMassLineChartResultDTO implements Serializable { * 群成员数 */ private List groupMemberData; + + /** + * 党员建群数 + **/ + private Integer groupTotal; + + /** + * 党成员数 + * */ + private Integer groupMemberTotal; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java index 902861f5e2..b895b49651 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java @@ -110,6 +110,8 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { result.setXAxis(xAxis); result.setGroupData(groupData); result.setGroupMemberData(groupMemberData); + result.setGroupTotal(groupData.stream().mapToInt(Integer :: intValue).sum()); + result.setGroupMemberTotal(groupMemberData.stream().mapToInt(Integer :: intValue).sum()); return result; }