From 88e5708a8d816d19c15e8496aded85b55b080ca7 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 30 Oct 2020 14:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8C=87=E6=A0=87=E6=97=B6?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=84=E5=88=86=E7=9A=84=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResultRecordController.java    | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 19e7b624..3cb8543a 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -590,24 +590,27 @@ public class ResultRecordController extends AbstractController {
                 }
                 if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){
                     BigDecimal score = BigDecimal.ZERO;
-                    for (ResultScoreDto scoreDto:detailDto.getScoreDtos()
-                    ) {
-                        //计算得分
-                        ResultScore resultScore = new ResultScore();
-                        BeanUtils.copyProperties(scoreDto, resultScore);
-                        if(scoreDto.getAcquireScore() != null){
-                            score = score.add(scoreDto.getAcquireScore().multiply(scoreDto.getWeight()));
+                    if(detailDto.getScoreDtos() != null){
+                        for (ResultScoreDto scoreDto:detailDto.getScoreDtos()
+                        ) {
+                            //计算得分
+                            ResultScore resultScore = new ResultScore();
+                            BeanUtils.copyProperties(scoreDto, resultScore);
+                            if(scoreDto.getAcquireScore() != null){
+                                score = score.add(scoreDto.getAcquireScore().multiply(scoreDto.getWeight()));
+                            }
+                            if(resultScore.getId() == null){
+                                insertScores.add(resultScore);
+                            }else{
+                                updateScores.add(resultScore);
+                            }
                         }
-                        if(resultScore.getId() == null){
-                            insertScores.add(resultScore);
-                        }else{
-                            updateScores.add(resultScore);
-                        }
-                    }
-                    resultDetail.setAcquireScore(score);
-                    weight = weight.add(resultDetail.getCheckWeight());
+                        resultDetail.setAcquireScore(score);
+                        weight = weight.add(resultDetail.getCheckWeight());
 
+                    }
                 }
+
             }
             if(weight.compareTo(model.getWeight()) == 1){
                 return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");