|
|
@ -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; |
|
|
|
} |
|
|
|
|
|
|
|