diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResult.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResult.java index ef79775673..051af134ba 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResult.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResult.java @@ -3,6 +3,7 @@ package com.epmet.evaluationindex.screen.dto.result; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; /** * @Author zxc @@ -22,4 +23,20 @@ public class MonthBarchartResult implements Serializable { private Double governAbility; private Double indexTotal; + + //新增返回权重 + /** + * 服务能力指数 权重 + */ + private BigDecimal serviceAblityWeight; + + /** + * 党建能力指数权重 + */ + private BigDecimal partyDevWeight; + + /** + * 治理能力分数,权重 + */ + private BigDecimal governAblityWeight; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResultDTO.java index ad21904ba2..8a8da975f1 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthBarchartResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.evaluationindex.screen.dto.result; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** @@ -38,4 +39,20 @@ public class MonthBarchartResultDTO implements Serializable { * 总指数集合 */ private List totalIndexData; + + //新增返回权重 + /** + * 服务能力指数 权重 + */ + private List serviceAblityWeightData; + + /** + * 党建能力指数权重 + */ + private List partyDevWeightData; + + /** + * 治理能力分数,权重 + */ + private List governAblityWeightData; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 4ff84d3ab6..07d18fdc20 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -106,6 +106,11 @@ public class IndexServiceImpl implements IndexService { List partyDevAbilityData = new ArrayList<>(); List governAbilityData = new ArrayList<>(); List totalIndexData = new ArrayList<>(); + + //添加返回权重 + List serviceAblityWeightData = new ArrayList<>(); + List partyDevWeightData = new ArrayList<>(); + List governAblityWeightData = new ArrayList<>(); // 1. x轴 result.setXAxis(partyMemberLeadServiceImpl.getXPro()); // 2. 查询近一年的指数值【包括本月】 @@ -116,11 +121,19 @@ public class IndexServiceImpl implements IndexService { partyDevAbilityData.add(NumConstant.ZERO_DOT_ZERO); governAbilityData.add(NumConstant.ZERO_DOT_ZERO); totalIndexData.add(NumConstant.ZERO_DOT_ZERO); + //添加返回权重 + serviceAblityWeightData.add(BigDecimal.ZERO); + partyDevWeightData.add(BigDecimal.ZERO); + governAblityWeightData.add(BigDecimal.ZERO); } result.setServiceAbilityData(serviceAbilityData); result.setPartyDevAbilityData(partyDevAbilityData); result.setGovernAbilityData(governAbilityData); result.setTotalIndexData(totalIndexData); + //添加返回权重 + result.setServiceAblityWeightData(serviceAblityWeightData); + result.setPartyDevWeightData(partyDevWeightData); + result.setGovernAblityWeightData(governAblityWeightData); return result; } // 处理小数四舍五入 @@ -129,6 +142,10 @@ public class IndexServiceImpl implements IndexService { barchart.setGovernAbility(getRound(barchart.getGovernAbility())); barchart.setServiceAbility(getRound(barchart.getServiceAbility())); barchart.setIndexTotal(getRound(barchart.getPartyDevAbility() + barchart.getGovernAbility() + barchart.getServiceAbility())); + //去除末尾0 + barchart.setServiceAblityWeight(new BigDecimal(barchart.getServiceAblityWeight().stripTrailingZeros().toPlainString())); + barchart.setPartyDevWeight(new BigDecimal(barchart.getPartyDevWeight().stripTrailingZeros().toPlainString())); + barchart.setGovernAblityWeight(new BigDecimal(barchart.getGovernAblityWeight().stripTrailingZeros().toPlainString())); }); List collect = monthBarchartResults.stream().sorted(Comparator.comparing(MonthBarchartResult::getMonthId)).collect(Collectors.toList()); //升序 当前月份在队尾 @@ -153,6 +170,10 @@ public class IndexServiceImpl implements IndexService { partyDevAbilityData.add(NumConstant.ZERO_DOT_ZERO); governAbilityData.add(NumConstant.ZERO_DOT_ZERO); totalIndexData.add(NumConstant.ZERO_DOT_ZERO); + //权重默认0 + serviceAblityWeightData.add(BigDecimal.ZERO); + partyDevWeightData.add(BigDecimal.ZERO); + governAblityWeightData.add(BigDecimal.ZERO); //保持cursor不变 }else{ MonthBarchartResult data = collect.get(cursor); @@ -161,6 +182,10 @@ public class IndexServiceImpl implements IndexService { partyDevAbilityData.add(null == data.getPartyDevAbility() ? NumConstant.ZERO_DOT_ZERO : data.getPartyDevAbility()); governAbilityData.add(null == data.getGovernAbility() ? NumConstant.ZERO_DOT_ZERO : data.getGovernAbility()); totalIndexData.add(null == data.getIndexTotal() ? NumConstant.ZERO_DOT_ZERO : data.getIndexTotal()); + //添加权重 + serviceAblityWeightData.add(null==data.getServiceAblityWeight()?BigDecimal.ZERO:data.getServiceAblityWeight()); + partyDevWeightData.add(null==data.getPartyDevWeight()?BigDecimal.ZERO:data.getPartyDevWeight()); + governAblityWeightData.add(null==data.getGovernAblityWeight()?BigDecimal.ZERO:data.getGovernAblityWeight()); //统计日期一致后移动游标 cursor++; } @@ -177,6 +202,10 @@ public class IndexServiceImpl implements IndexService { result.setPartyDevAbilityData(partyDevAbilityData); result.setGovernAbilityData(governAbilityData); result.setTotalIndexData(totalIndexData); + //添加返回权重 + result.setServiceAblityWeightData(serviceAblityWeightData); + result.setPartyDevWeightData(partyDevWeightData); + result.setGovernAblityWeightData(governAblityWeightData); return result; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml index 55dd281ff5..8011535fdb 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml @@ -33,7 +33,10 @@ month_id AS monthId, service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility, party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility, - govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility + govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility, + SERVICE_ABLITY_WEIGHT as serviceAblityWeight, + PARTY_DEV_WEIGHT as partyDevWeight, + GOVERN_ABLITY_WEIGHT as governAblityWeight FROM screen_index_data_monthly WHERE