数据融合引起的基础数据模块组织层级添加返参

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyGroupResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyGroupResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //党群小组总数
     private Integer groupTotal = 0;
     //楼院小组总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyIssueResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyIssueResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //议题总数
     private Integer issueTotal = 0;
     //表决中总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyProjectResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyProjectResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //项目总数
     private Integer projectTotal = 0;
     //处理中总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyTopicResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyTopicResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //话题总数
     private Integer topicTotal = 0;
     //热议中总数

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/SubAgencyUserResultDTO.java

@@ -19,6 +19,10 @@ public class SubAgencyUserResultDTO implements Serializable {
     private String agencyId;
     //组织名称
     private String agencyName;
+    //机关级别[社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province
+    private String level;
+    //行政地区编码
+    private String areaCode;
     //用户总数
     private Integer userTotal = 0;
     //党员总数

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -302,6 +302,8 @@ public class DataStatsServiceImpl implements DataStatsService {
             SubAgencyUserResultDTO dto = new SubAgencyUserResultDTO();
             dto.setAgencyId(sub.getAgencyId());
             dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             for (SubAgencyUserResultDTO u : list) {
                 if (sub.getAgencyId().equals(u.getAgencyId())) {
                     dto.setUserTotal(u.getUserTotal());
@@ -438,6 +440,8 @@ public class DataStatsServiceImpl implements DataStatsService {
             SubAgencyGroupResultDTO dto = new SubAgencyGroupResultDTO();
             dto.setAgencyId(sub.getAgencyId());
             dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             for (SubAgencyGroupResultDTO u : list) {
                 if (sub.getAgencyId().equals(u.getAgencyId())) {
                     dto.setGroupTotal(u.getGroupTotal());
@@ -597,6 +601,8 @@ public class DataStatsServiceImpl implements DataStatsService {
 
             resultDTO.setAgencyId(sub.getAgencyId());
             resultDTO.setAgencyName(sub.getAgencyName());
+            resultDTO.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            resultDTO.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             resultDTO.setTopicTotal(topicTotal.get());
             resultDTO.setDiscussingTotal(hotdiscussTotal.get());
             resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
@@ -758,6 +764,8 @@ public class DataStatsServiceImpl implements DataStatsService {
             SubAgencyIssueResultDTO dto = new SubAgencyIssueResultDTO();
             dto.setAgencyId(sub.getAgencyId());
             dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             for (SubAgencyIssueResultDTO u : list) {
                 if (sub.getAgencyId().equals(u.getAgencyId())) {
                     dto.setIssueTotal(u.getIssueTotal());
@@ -898,6 +906,8 @@ public class DataStatsServiceImpl implements DataStatsService {
             SubAgencyProjectResultDTO dto = new SubAgencyProjectResultDTO();
             dto.setAgencyId(sub.getAgencyId());
             dto.setAgencyName(sub.getAgencyName());
+            dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+            dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
             for (SubAgencyProjectResultDTO u : list) {
                 if (sub.getAgencyId().equals(u.getAgencyId())) {
                     dto.setProjectTotal(u.getProjectTotal());