From 49f1d0074fe415ef327c26d0df07b09aa10d9c33 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 14 Jul 2021 12:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E5=BA=A6=E5=BE=97=E5=88=86=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9D=83=E9=87=8D=E5=92=8C=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/MonthBarchartResult.java | 15 ++++++++++ .../dto/result/MonthBarchartResultDTO.java | 15 ++++++++++ .../dto/result/MonthPieChartResultDTO.java | 29 +++++++++++++++++++ .../screen/impl/IndexServiceImpl.java | 23 +++++++++++++++ .../screen/ScreenIndexDataMonthlyDao.xml | 9 ++++++ 5 files changed, 91 insertions(+) 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 051af134ba..5a010ea45b 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 @@ -39,4 +39,19 @@ public class MonthBarchartResult implements Serializable { * 治理能力分数，权重 */ private BigDecimal governAblityWeight; + + /** + * 党建能力 原始得分 + */ + private BigDecimal partyOriginScore = new BigDecimal(0.0); + + /** + * 治理能力 原始得分 + */ + private BigDecimal governOriginScore = new BigDecimal(0.0); + + /** + * 服务能力 原始得分 + */ + private BigDecimal serviceOriginScore = new BigDecimal(0.0); } 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 8a8da975f1..c86efe0c28 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 @@ -55,4 +55,19 @@ public class MonthBarchartResultDTO implements Serializable { * 治理能力分数，权重 */ private List governAblityWeightData; + + /** + * 党建能力 原始得分 + */ + private List partyOriginScore; + + /** + * 治理能力 原始得分 + */ + private List governOriginScore; + + /** + * 服务能力 原始得分 + */ + private List serviceOriginScore; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthPieChartResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthPieChartResultDTO.java index de0b16022b..b9abf888d1 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthPieChartResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/MonthPieChartResultDTO.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 @@ -28,6 +29,34 @@ public class MonthPieChartResultDTO implements Serializable { */ private Double governAbility = 0.0; + /** + * 党建能力 原始得分 + */ + private BigDecimal partyOriginScore = new BigDecimal(0.0); + + /** + * 治理能力 原始得分 + */ + private BigDecimal governOriginScore = new BigDecimal(0.0); + + /** + * 服务能力 原始得分 + */ + private BigDecimal serviceOriginScore = new BigDecimal(0.0); + + /** + * 服务能力权重(保留一位小数) + */ + private Double serviceAblityWeight=0.0; + /** + * 党建能力权重(保留一位小数) + */ + private Double partyDevWeight=0.0; + /** + * 治理能力权重(保留一位小数) + */ + private Double governAblityWeight=0.0; + /** * 月份Id */ 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 643b27b4fd..d945b93460 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 @@ -112,6 +112,9 @@ public class IndexServiceImpl implements IndexService { List serviceAblityWeightData = new ArrayList<>(); List partyDevWeightData = new ArrayList<>(); List governAblityWeightData = new ArrayList<>(); + List serviceOriginData = new ArrayList<>(); + List partyOriginData = new ArrayList<>(); + List governOriginData = new ArrayList<>(); // 1. x轴 if(StringUtils.isNotBlank(monthBarchartFormDTO.getMonthId())){ result.setXAxis(partyMemberLeadServiceImpl.getXproEndMonth(monthBarchartFormDTO.getMonthId())); @@ -132,6 +135,9 @@ public class IndexServiceImpl implements IndexService { serviceAblityWeightData.add(BigDecimal.ZERO); partyDevWeightData.add(BigDecimal.ZERO); governAblityWeightData.add(BigDecimal.ZERO); + serviceOriginData.add(BigDecimal.ZERO); + partyOriginData.add(BigDecimal.ZERO); + governOriginData.add(BigDecimal.ZERO); } result.setServiceAbilityData(serviceAbilityData); result.setPartyDevAbilityData(partyDevAbilityData); @@ -141,6 +147,9 @@ public class IndexServiceImpl implements IndexService { result.setServiceAblityWeightData(serviceAblityWeightData); result.setPartyDevWeightData(partyDevWeightData); result.setGovernAblityWeightData(governAblityWeightData); + result.setServiceOriginScore(serviceOriginData); + result.setPartyOriginScore(partyOriginData); + result.setGovernOriginScore(governOriginData); return result; } // 处理小数四舍五入 @@ -186,6 +195,10 @@ public class IndexServiceImpl implements IndexService { serviceAblityWeightData.add(BigDecimal.ZERO); partyDevWeightData.add(BigDecimal.ZERO); governAblityWeightData.add(BigDecimal.ZERO); + //原始分数默认0 + serviceOriginData.add(BigDecimal.ZERO); + partyOriginData.add(BigDecimal.ZERO); + governOriginData.add(BigDecimal.ZERO); //保持cursor不变 }else{ MonthBarchartResult data = collect.get(cursor); @@ -198,6 +211,11 @@ public class IndexServiceImpl implements IndexService { 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()); + + //添加权重 + serviceOriginData.add(null==data.getServiceOriginScore()?BigDecimal.ZERO:data.getServiceOriginScore()); + partyOriginData.add(null==data.getPartyOriginScore()?BigDecimal.ZERO:data.getPartyOriginScore()); + governOriginData.add(null==data.getGovernOriginScore()?BigDecimal.ZERO:data.getGovernOriginScore()); //统计日期一致后移动游标 cursor++; } @@ -218,6 +236,11 @@ public class IndexServiceImpl implements IndexService { result.setServiceAblityWeightData(serviceAblityWeightData); result.setPartyDevWeightData(partyDevWeightData); result.setGovernAblityWeightData(governAblityWeightData); + //添加返回原始值 + //添加返回权重 + result.setServiceOriginScore(serviceOriginData); + result.setPartyOriginScore(partyOriginData); + result.setGovernOriginScore(governOriginData); 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 84d995e2a4..ce83c8e058 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 @@ -9,6 +9,12 @@ service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility, party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility, govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility, + ROUND(service_ablity,1) serviceOriginScore, + ROUND(party_dev_ablity,1) partyOriginScore, + ROUND(govern_ablity,1) governOriginScore, + SERVICE_ABLITY_WEIGHT serviceAblityWeight, + PARTY_DEV_WEIGHT partyDevWeight, + GOVERN_ABLITY_WEIGHT governAblityWeight, MONTH_ID FROM screen_index_data_monthly @@ -35,6 +41,9 @@ service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility, party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility, govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility, + ROUND(service_ablity,1) serviceOriginScore, + ROUND(party_dev_ablity,1) partyOriginScore, + ROUND(govern_ablity,1) governOriginScore, SERVICE_ABLITY_WEIGHT as serviceAblityWeight, PARTY_DEV_WEIGHT as partyDevWeight, GOVERN_ABLITY_WEIGHT as governAblityWeight