Merge branch 'dev_third_data' into dev_temp

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;
 	/**
 	 * 党员建组数
 	 */

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;