From 14d5ef825a20b10e84626770516e88d742ccc81e Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 5 Jun 2021 13:17:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?sql=E5=8A=A0=E5=BC=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datastats/DatsStatsDao.xml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) 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..e16730136c 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 @@ -654,4 +654,4 @@ ORDER BY problem_resolved_count DESC - \ No newline at end of file + From fd10b15cbbf9cebfcf6da02c5b1a9b9465af8cbd Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 5 Jun 2021 13:23:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8A=A0=E5=BC=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/datastats/impl/DataStatsServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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); } From 1f6e7ed3cfaf09775d161f5b5bf4003cce263123 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 5 Jun 2021 13:28:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8A=A0=E5=BC=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/datastats/DatsStatsDao.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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 e16730136c..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 @@ -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 From 675d0574bff68e35b14e376ae90a9e3137c3497f Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 5 Jun 2021 13:38:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BB=88=E4=BA=8E=E6=89=BE=E5=88=B0?= =?UTF-8?q?=E7=B2=BE=E9=AB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PartyMemberVanguardDetailResultDTO.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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; /** * 党员发布话题转项目结案数占比 */