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 ad1d27d9e6..39e833c4b1 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 @@ -30,7 +30,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable { /** * 党员建组数 */ - private Integer groupCount; + private Integer groupCount = 0; /** * 党员建组数占比 */ @@ -38,7 +38,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable { /** * 组内党员人数 */ - private Integer groupMemberCount; + private Integer groupMemberCount = 0; /** * 组内党员人数占比 */ @@ -46,7 +46,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable { /** * 党员发布话题数 */ - private Integer topicCount; + private Integer topicCount = 0; /** * 党员发布话题数占比 */ @@ -54,7 +54,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable { /** * 党员发布话题转议题数 */ - private Integer issueCount; + private Integer issueCount = 0; /** * 党员发布话题转议题数占比 */ @@ -62,7 +62,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable { /** * 党员发布话题转项目数 */ - private Integer projectCount; + private Integer projectCount = 0; /** * 党员发布话题转项目数占比 */ @@ -70,7 +70,7 @@ public class PartyMemberVanguardDetailResultDTO implements Serializable { /** * 党员发布话题转项目结案数 */ - private Integer projectClosedCount; + private Integer projectClosedCount = 0; /** * 党员发布话题转项目结案数占比 */ 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 0bf1504b81..b61338b163 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 @@ -1044,6 +1044,9 @@ public class DataStatsServiceImpl implements DataStatsService { } private BigDecimal transform(BigDecimal count) { + if (count == null){ + count = NumConstant.ZERO_DECIMAL; + } return count.multiply(new BigDecimal(NumConstant.ONE_HUNDRED) ).setScale(NumConstant.ONE, RoundingMode.HALF_UP); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index fafc989776..57d9edebc8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -360,18 +360,18 @@ SELECT orgId, orgName, - GROUP_COUNT, - GROUP_RATIO, - GROUP_MEMBER_COUNT, - GROUP_MEMBER_RATIO, - TOPIC_COUNT, - TOPIC_RATIO, - ISSUE_COUNT, - ISSUE_RATIO, - PROJECT_COUNT, - PROJECT_RATIO, - PROJECT_CLOSED_COUNT, - PROJECT_CLOSED_RATIO + ifnull(GROUP_COUNT,0), + ifnull(GROUP_RATIO,0), + ifnull(GROUP_MEMBER_COUNT,0), + ifnull(GROUP_MEMBER_RATIO,0), + ifnull(TOPIC_COUNT,0), + ifnull(TOPIC_RATIO,0), + ifnull(ISSUE_COUNT,0), + ifnull(ISSUE_RATIO,0), + ifnull(PROJECT_COUNT,0), + ifnull(PROJECT_RATIO,0), + ifnull(PROJECT_CLOSED_COUNT,0), + ifnull(PROJECT_CLOSED_RATIO,0) FROM ( SELECT @@ -403,18 +403,18 @@ SELECT orgId, orgName, - GROUP_COUNT, - GROUP_RATIO, - GROUP_MEMBER_COUNT, - GROUP_MEMBER_RATIO, - TOPIC_COUNT, - TOPIC_RATIO, - ISSUE_COUNT, - ISSUE_RATIO, - PROJECT_COUNT, - PROJECT_RATIO, - PROJECT_CLOSED_COUNT, - PROJECT_CLOSED_RATIO + ifnull(GROUP_COUNT,0), + ifnull(GROUP_RATIO,0), + ifnull(GROUP_MEMBER_COUNT,0), + ifnull(GROUP_MEMBER_RATIO,0), + ifnull(TOPIC_COUNT,0), + ifnull(TOPIC_RATIO,0), + ifnull(ISSUE_COUNT,0), + ifnull(ISSUE_RATIO,0), + ifnull(PROJECT_COUNT,0), + ifnull(PROJECT_RATIO,0), + ifnull(PROJECT_CLOSED_COUNT,0), + ifnull(PROJECT_CLOSED_RATIO,0) FROM ( SELECT @@ -654,4 +654,4 @@ ORDER BY problem_resolved_count DESC - \ No newline at end of file +