From 6886ffd0adfea6098348eda4f6559c1920d25657 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 2 Jun 2021 16:28:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B-=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E7=BB=84=E7=BB=87=E6=8E=92=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastats/result/PartyMemberVanguardDetailResultDTO.java | 4 ++++ .../service/datastats/impl/DataStatsServiceImpl.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java index 929178031d..ad1d27d9e6 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/PartyMemberVanguardDetailResultDTO.java @@ -23,6 +23,10 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable { * 组织名 */ private String orgName; + /** + * 组织类型 机关 agency 网格 grid + */ + private String orgType; /** * 党员建组数 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index a916acf6cc..72a5501eb8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1025,6 +1025,7 @@ public class DataStatsServiceImpl implements DataStatsService { item.setIssueRatio(transform(item.getIssueRatio())); item.setProjectRatio(transform(item.getProjectRatio())); item.setProjectClosedRatio(transform(item.getProjectClosedRatio())); + item.setOrgType(OrgConstant.AGENCY); }); result.getGridRank().forEach(item -> { item.setGroupRatio(transform(item.getGroupRatio())); @@ -1033,6 +1034,7 @@ public class DataStatsServiceImpl implements DataStatsService { item.setIssueRatio(transform(item.getIssueRatio())); item.setProjectRatio(transform(item.getProjectRatio())); item.setProjectClosedRatio(transform(item.getProjectClosedRatio())); + item.setOrgType(OrgConstant.GRID); }); result.setAgencyLevel(agency.getLevel()); return result;