From 2f256043ad244a289a3c0f1b5c3af844249564ee Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 19 Aug 2020 15:59:03 +0800 Subject: [PATCH] =?UTF-8?q?4=E3=80=81=E6=94=AF=E9=83=A8=E5=BB=BA=E8=AE=BE?= =?UTF-8?q?=E6=83=85=E5=86=B5|=E8=81=94=E5=BB=BA=E5=85=B1=E5=BB=BA?= =?UTF-8?q?=E6=83=85=E5=86=B5-=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/BranchBuildRankResultDTO.java | 14 ++++++++ .../PartymemberAgeDistributionResultDTO.java | 24 +++++++++----- .../dao/screen/ScreenCpcBaseDataDao.java | 4 +-- .../screen/GrassrootsPartyDevService.java | 12 +++++++ .../impl/GrassrootsPartyDevServiceImpl.java | 32 +++++++++---------- .../mapper/screen/ScreenCpcBaseDataDao.xml | 11 ++++--- .../screen/ScreenPartyBranchDataDao.xml | 26 +++++++++++++++ 7 files changed, 92 insertions(+), 31 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java index 9b1584e276..f7593319e1 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/BranchBuildRankResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.screen.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description 4、支部建设情况|联建共建情况-排行 返参dto @@ -14,5 +15,18 @@ import java.io.Serializable; public class BranchBuildRankResultDTO implements Serializable { private static final long serialVersionUID = 6213072175254509349L; + /** + * 组织次数 + * */ + private List organizeData; + /** + * 组织名称数组 + * */ + private List xAxis; + + /** + * 参与人数 + * */ + private List joinData; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java index b9a22cb55b..6ae70d9a67 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/PartymemberAgeDistributionResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.screen.dto.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; @@ -15,22 +16,29 @@ public class PartymemberAgeDistributionResultDTO implements Serializable { private static final long serialVersionUID = -3477512511475784330L; /** - * 30岁以下 的党员占 注册党员总数的百分比 （返回数字，小数点后保留两位） + * 30岁以下 的党员 * */ - private String under30Ratio; + private Integer under30Count = NumConstant.ZERO; /** - * 31-50岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位） + * 31-50岁 的党员 * */ - private String between31And50Ratio; + private Integer between31And50Count = NumConstant.ZERO; /** - * 51-60岁 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位） + * 51-60岁 的党员 * */ - private String between51And60Ratio; + private Integer between51And60Count = NumConstant.ZERO; /** - * 61岁以上 的党员占 注册党员总数的百分比（返回数字，小数点后保留两位） + * 61岁以上 的党员 * */ - private String above61; + private Integer above61Count = NumConstant.ZERO; + + /** + * 党员总数 + * */ + private Integer partyTotal = NumConstant.ZERO; + + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java index 26f91ed0be..87f26f3b01 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenCpcBaseDataDao.java @@ -17,7 +17,7 @@ package com.epmet.datareport.dao.screen; -import com.epmet.screen.dto.result.PartymemberAgePercentResultDTO; +import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -38,7 +38,7 @@ public interface ScreenCpcBaseDataDao{ * @author wangc * @date 2020.08.18 17:47 **/ - PartymemberAgePercentResultDTO selectPartymemberAgeDistribution(@Param("agencyId") String agencyId); + PartymemberAgeDistributionResultDTO selectPartymemberAgeDistribution(@Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java index 8caa92ac10..a870d21585 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/GrassrootsPartyDevService.java @@ -1,7 +1,9 @@ package com.epmet.datareport.service.screen; +import com.epmet.screen.dto.form.BranchBuildRankFormDTO; import com.epmet.screen.dto.form.BranchBuildTrendFormDTO; import com.epmet.screen.dto.form.ParymemberFormDTO; +import com.epmet.screen.dto.result.BranchBuildRankResultDTO; import com.epmet.screen.dto.result.BranchBuildTrendResultDTO; import com.epmet.screen.dto.result.PartymemberAgeDistributionResultDTO; import com.epmet.screen.dto.result.PartymemberPercentResultDTO; @@ -43,4 +45,14 @@ public interface GrassrootsPartyDevService { * @date 2020.08.19 11:02 **/ BranchBuildTrendResultDTO branchBuildTrend(BranchBuildTrendFormDTO param); + + /** + * @Description 4、支部建设情况|联建共建情况-排行 + * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982 + * @param param + * @return + * @author wangc + * @date 2020.08.19 15:25 + **/ + BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java index d0458bfca5..893f5115ce 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassrootsPartyDevServiceImpl.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.datareport.dao.screen.ScreenCpcBaseDataDao; import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao; import com.epmet.datareport.dao.screen.ScreenUserTotalDataDao; +import com.epmet.screen.dto.form.BranchBuildRankFormDTO; import com.epmet.screen.dto.form.BranchBuildTrendFormDTO; import com.epmet.screen.dto.form.ParymemberFormDTO; import com.epmet.screen.dto.result.*; @@ -76,22 +77,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService **/ @Override public PartymemberAgeDistributionResultDTO partymemberAgeDistribution(ParymemberFormDTO param) { - PartymemberAgePercentResultDTO percent = screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId()); - PartymemberAgeDistributionResultDTO result = new PartymemberAgeDistributionResultDTO(); - - if(null == percent.getUnder30Ratio()) percent.setUnder30Ratio(new BigDecimal(NumConstant.ZERO)); - result.setUnder30Ratio(convertPercentStr(percent.getUnder30Ratio())); - - if(null == percent.getBetween31And50Ratio()) percent.setBetween31And50Ratio(new BigDecimal(NumConstant.ZERO)); - result.setBetween31And50Ratio(convertPercentStr(percent.getBetween31And50Ratio())); - - if(null == percent.getBetween51And60Ratio()) percent.setBetween51And60Ratio(new BigDecimal(NumConstant.ZERO)); - result.setBetween51And60Ratio(convertPercentStr(percent.getBetween51And60Ratio())); - - if(null == percent.getAbove61()) percent.setAbove61(new BigDecimal(NumConstant.ZERO)); - result.setAbove61(convertPercentStr(percent.getAbove61())); - - return result; + return screenCpcBaseDataDao.selectPartymemberAgeDistribution(param.getAgencyId()); } /** @@ -159,6 +145,20 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService result.setSeriesData(dataArray); result.setLegend(null == result.getLegend() ? new ArrayList<>() : result.getLegend()); + return result; + } + + /** + * @Description 4、支部建设情况|联建共建情况-排行 + * @NEI https://nei.netease.com/interface/detail/res/?pid=57068&id=321982 + * @param param + * @return BranchBuildRankResultDTO + * @author wangc + * @date 2020.08.19 15:25 + **/ + @Override + public BranchBuildRankResultDTO branchBuildRank(BranchBuildRankFormDTO param) { + return null; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml index 24b84fb507..3fc9c990b3 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCpcBaseDataDao.xml @@ -4,12 +4,13 @@ - SELECT - SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 ) AS under30Ratio, - SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Ratio, - SUM( AGE_LEVEL_5 ) AS between51And60Ratio, - SUM( AGE_LEVEL_6 ) AS above61 + SUM( AGE_LEVEL_1 ) + SUM( AGE_LEVEL_2 ) AS under30Count, + SUM( AGE_LEVEL_3 ) + SUM( AGE_LEVEL_4 ) AS between31And50Count, + SUM( AGE_LEVEL_5 ) AS between51And60Count, + SUM( AGE_LEVEL_6 ) AS above61Count, + SUM( PARTY_MEMBER_COUNT) AS partyTotal FROM screen_cpc_base_data WHERE diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml index c095f123a6..67b6006b05 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyBranchDataDao.xml @@ -38,4 +38,30 @@ ISSUE_CATEGORY_NAME + + \ No newline at end of file