月度得分 返回权重和原始值

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

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<BigDecimal> governAblityWeightData;
+
+    /**
+     * 党建能力 原始得分
+     */
+    private List<BigDecimal>  partyOriginScore;
+
+    /**
+     * 治理能力 原始得分
+     */
+    private List<BigDecimal>  governOriginScore;
+
+    /**
+     * 服务能力 原始得分
+     */
+    private List<BigDecimal>  serviceOriginScore;
 }

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
      */

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<BigDecimal> serviceAblityWeightData = new ArrayList<>();
         List<BigDecimal> partyDevWeightData = new ArrayList<>();
         List<BigDecimal> governAblityWeightData = new ArrayList<>();
+        List<BigDecimal> serviceOriginData = new ArrayList<>();
+        List<BigDecimal> partyOriginData = new ArrayList<>();
+        List<BigDecimal> 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;
     }
 

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