五级指标保存参与计算的原始值

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyScoreDTO.java

@@ -69,12 +69,17 @@ public class AgencyScoreDTO implements Serializable {
     /**
      * 月维度Id: yyyyMM
      */
-	private String monthId;
+    private String monthId;
 
     /**
      * 1：总分；0不是；默认0
      */
-	private String isTotal;
+    private String isTotal;
+
+    /**
+     * 参与计算的原始值
+     */
+    private String originValue;
 
     /**
      * 分值

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/FactIndexCommunityScoreDTO.java

@@ -67,22 +67,27 @@ public class FactIndexCommunityScoreDTO implements Serializable {
     /**
      * 月维度Id: yyyyMM
      */
-	private String monthId;
+    private String monthId;
 
     /**
      * 1：总分；0不是；默认0
      */
-	private String isTotal;
+    private String isTotal;
+
+    /**
+     * 参与计算指标的原始值
+     */
+    private String originValue;
 
     /**
      * 分值
      */
-	private BigDecimal score;
+    private BigDecimal score;
 
     /**
      * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；社区相关：shequxiangguan
      */
-	private String indexCode;
+    private String indexCode;
 
     /**
      * 所有指标code拼接的字符串 冒号隔开

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -314,6 +314,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
                 child.setAllParentIndexCode(o.getAllParentIndexCode());
                 child.setScore(o.getScore());
                 child.setWeight(o.getWeight());
+                child.setOriginValue(o.getOriginValue());
                 subList.add(child);
             });
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java

@@ -322,6 +322,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
                 deptSubScore.setAllParentIndexCode(detail.getAllParentIndexCode());
                 deptSubScore.setScore(detail.getScore());
                 deptSubScore.setWeight(detail.getWeight());
+                deptSubScore.setOriginValue(detail.getOriginValue());
                 deptSubScoreEntityList.add(deptSubScore);
             }
         });

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@@ -376,6 +376,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     gridSubScoreEntity.setAllParentIndexCode(detail.getAllParentIndexCode());
                     gridSubScoreEntity.setScore(detail.getScore());
                     gridSubScoreEntity.setWeight(detail.getWeight());
+                    gridSubScoreEntity.setOriginValue(detail.getOriginValue());
                     gridSubScoreList.add(gridSubScoreEntity);
                 }
             });
@@ -458,7 +459,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                 minValue = contactMassesAblityMap.get(StrConstant.MIN);
                 maxValue = contactMassesAblityMap.get(StrConstant.MAX);
             } else if (IndexCodeEnum.ZUZHINEIDANGYDSYYSNLKPFPJZ.getCode().equals(index.getIndexCode())) {
-//                log.info("组织内党员的参与议事能力考评分（平均值） 单独处理");
+//                log.info("组织内党员的参与议事能力考评分平均值） 单独处理");
                 Map<String, BigDecimal> joinIssueAblityMap = this.getJoinIssueAblityMap(formDTO);
                 minValue = joinIssueAblityMap.get(StrConstant.MIN);
                 maxValue = joinIssueAblityMap.get(StrConstant.MAX);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@@ -458,6 +458,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
                     s.setScore(fiveDetail.getScore());
                     s.setAllParentIndexCode(fiveDetail.getAllParentIndexCode());
                     s.setWeight(fiveDetail.getWeight());
+                    s.setOriginValue(fiveDetail.getOriginValue());
                     pid.forEach((agency, parentAgency) -> {
                         if (k.equals(agency)) {
                             s.setParentAgencyId(parentAgency);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@@ -435,6 +435,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                     s.setAllParentIndexCode(streetScore.getAllParentIndexCode());
                     s.setDataType(IndexCalConstant.DISTRICT_LEVEL);
                     s.setWeight(streetScore.getWeight());
+                    s.setOriginValue(streetScore.getOriginValue());
                     pid.forEach((agency, parentAgency) -> {
                         //todo 确认
                         if (k != null && k.equals(agency)) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@@ -463,6 +463,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
                     s.setDataType(IndexCalConstant.STREET_LEVEL);
                     s.setAllParentIndexCode(streetScore.getAllParentIndexCode());
                     s.setWeight(streetScore.getWeight());
+                    s.setOriginValue(streetScore.getOriginValue());
                     pid.forEach((agency, parentAgency) -> {
                         if (k.equals(agency)) {
                             s.setParentAgencyId(parentAgency);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java

@@ -79,7 +79,7 @@ public class BatchScoreCalculator {
                     result.setDetails(new ArrayList<>());
                     scoreCountOfSamples.put(sampleId, result);
                 }
-                IndexScoreVo sampleScore = new IndexScoreVo(idx.getIndexId(), idx.getAllParentIndexCode(), normalizeValue, idx.getWeight());
+                IndexScoreVo sampleScore = new IndexScoreVo(idx.getIndexId(), idx.getAllParentIndexCode(), String.valueOf(vo.getSampleValue()), normalizeValue, idx.getWeight());
                 result.getDetails().add(sampleScore);
                 result.setTotalScore(result.getTotalScore().add(score).setScale(6, RoundingMode.HALF_UP));
             }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/IndexScoreVo.java

@@ -22,6 +22,10 @@ public class IndexScoreVo implements Serializable {
      * 所有指标code拼接的字符串 冒号隔开
      */
     private String allParentIndexCode;
+    /**
+     * 参与计算的原始值
+     */
+    private String originValue;
     /**
      * 分值
      */