From ea5250d1f9572fc1bd4ab2c68a7877aae5a80839 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 1 Sep 2020 10:28:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=88=E5=80=BCv1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GridCorreLationServiceImpl.java      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java
index 98a35e93fe..7fa8281f15 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java
@@ -344,13 +344,13 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
     private Map<String, IndexInputVO<BigDecimal>> buildGridCorrelationIndexInputVO(CalculateCommonFormDTO formDTO, List<IndexGroupDetailEntity> indexList, Map<String, Object> minAndMaxMap) {
         Map<String, IndexInputVO<BigDecimal>> map = new HashMap<>();
         for (IndexGroupDetailEntity index : indexList) {
-            IndexInputVO indexInputVO = new IndexInputVO();
+//            IndexInputVO indexInputVO = new IndexInputVO();
             // 指标code
-            indexInputVO.setIndexId(index.getIndexCode());
+//            indexInputVO.setIndexId(index.getIndexCode());
             //阈值
-            indexInputVO.setThreshold(index.getThreshold());
+//            indexInputVO.setThreshold(index.getThreshold());
             //权重
-            indexInputVO.setWeight(index.getWeight());
+//            indexInputVO.setWeight(index.getWeight());
             BigDecimal minValue = null;
             BigDecimal maxValue = null;
             if (IndexCodeEnum.ZUZHINEIDANGYDLXQZNLKPFPJZ.getCode().equals(index.getIndexCode())) {
@@ -384,11 +384,15 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                     ScoreConstants.MAX_SCORE,
                     Correlation.getCorrelation(index.getCorrelation())
             );
-            indexInputVO.setScoreCalculator(scoreCalculator);
+//            indexInputVO.setScoreCalculator(scoreCalculator);
             List<SampleValue<BigDecimal>> sampleValueList = new ArrayList<>();
-            indexInputVO.setIndexValueVOs(sampleValueList);
-
-            map.put(index.getIndexCode(), indexInputVO);
+//            indexInputVO.setIndexValueVOs(sampleValueList);
+            IndexInputVO indexInputVO1 = new IndexInputVO(index.getIndexCode(),
+                                                         sampleValueList,
+                                                         index.getThreshold(),
+                                                         index.getWeight(),
+                                                         scoreCalculator);
+            map.put(index.getIndexCode(), indexInputVO1);
         }
         return map;
     }