From 7ccfbc9fc2881ee998e284926e4fb52657209a73 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 11 Nov 2020 13:59:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResultRecordController.java    | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 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 687c046e..03a80800 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -387,9 +387,9 @@ public class ResultRecordController extends AbstractController {
                     staffs.addAll(departManagers.getManagers());
                 }
             }
-            if(staffs.size() == 0){
+            /*if(staffs.size() == 0){
                 return R.error("找不到有效的评分人，设置的评分人不存在");
-            }
+            }*/
 
             for (StaffEntity staff:staffs
             ) {
@@ -426,45 +426,48 @@ public class ResultRecordController extends AbstractController {
                 //下面设置计算公式
                 dto.setCalculate(setCalculateValue(calculateModels, dto)) ;
                 weight = weight.add(dto.getCheckWeight());
-                //获取评分详细
-                List<ResultScore> scores =
-                        resultScoreService.selectResultScoresByDetailIdAndOrderByStaffIds(dto.getId(), scoreDtos);
-                if(scores.size() > 0){
-                    //
-                    List<ResultScoreDto> scoreDtos1 = new ArrayList<>();
-                    for (ResultScoreDto scoreDto: scoreDtos
-                         ) {//
+                if(scoreDtos.size() > 0){
+                    //获取评分详细
+                    List<ResultScore> scores =
+                            resultScoreService.selectResultScoresByDetailIdAndOrderByStaffIds(dto.getId(), scoreDtos);
+                    if(scores.size() > 0){
                         //
-                        boolean isAdd = false;
-                        for (ResultScore score:
-                        scores) {
-                            if(scoreDto.getApprovalId().longValue() == score.getApprovalId().longValue()){
+                        List<ResultScoreDto> scoreDtos1 = new ArrayList<>();
+                        for (ResultScoreDto scoreDto: scoreDtos
+                        ) {//
+                            //
+                            boolean isAdd = false;
+                            for (ResultScore score:
+                                    scores) {
+                                if(scoreDto.getApprovalId().longValue() == score.getApprovalId().longValue()){
+                                    ResultScoreDto scoreDto1 = new ResultScoreDto();
+                                    BeanUtils.copyProperties(score, scoreDto1);
+                                    scoreDto1.setApprovalId(scoreDto.getApprovalId());
+                                    scoreDto1.setApprovalName(scoreDto.getApprovalName());
+                                    scoreDto1.setWeight(scoreDto.getWeight());
+                                    scoreDtos1.add(scoreDto1);
+                                    scores.remove(score);
+                                    isAdd = true;
+                                    break;
+                                }
+                            }
+                            if(!isAdd){
                                 ResultScoreDto scoreDto1 = new ResultScoreDto();
-                                BeanUtils.copyProperties(score, scoreDto1);
                                 scoreDto1.setApprovalId(scoreDto.getApprovalId());
                                 scoreDto1.setApprovalName(scoreDto.getApprovalName());
                                 scoreDto1.setWeight(scoreDto.getWeight());
                                 scoreDtos1.add(scoreDto1);
-                                scores.remove(score);
-                                isAdd = true;
-                                break;
                             }
                         }
-                        if(!isAdd){
-                            ResultScoreDto scoreDto1 = new ResultScoreDto();
-                            scoreDto1.setApprovalId(scoreDto.getApprovalId());
-                            scoreDto1.setApprovalName(scoreDto.getApprovalName());
-                            scoreDto1.setWeight(scoreDto.getWeight());
-                            scoreDtos1.add(scoreDto1);
-                        }
+                        dto.setScoreDtos(scoreDtos1);
+                    }else{
+                        dto.setScoreDtos(scoreDtos);
                     }
-                    dto.setScoreDtos(scoreDtos1);
-                }else{
-                    dto.setScoreDtos(scoreDtos);
                 }
             }
 
 
+
             resultRecortModelDto.setDetailDtos(detailDtos);
             resultRecortModelDtos.add(resultRecortModelDto);
         }