From 59550c4dfbd227196fc9cc41efbff7653b40af65 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 3 Dec 2020 14:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/impl/ResultRecordServiceImpl.java     | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index ad1a51cd..f5fc034b 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -1447,20 +1447,29 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     @Override
     public R resetData(Long recordId, int clearFlag) {
         List<ResultDetail> resultDetails = resultDetailService.selectByRecordId(recordId);
-        log.info("需要删除指标个数{}", resultDetails.size());
-        if(clearFlag == 1){
-            log.info("全部清空，删除所有指标即可");
-            resultDetailService.deleteResultDetailByRecordId(recordId);
-            //return R.ok();
-        }
-        //删除指标以外的所有数据，评分、评分说明、结果
 
-        for(ResultDetail detail : resultDetails){
-            detail.setCheckResult(null);
-            detail.setAcquireScore(null);
-            detail.setSuperScore(null);
-            resultScoreService.deleteResultScoreByDetailId(detail.getId());
+        log.info("需要删除指标个数{}", resultDetails.size());
+        if(resultDetails.size() > 0){
+            if(clearFlag == 1){
+                log.info("全部清空，删除所有指标即可");
+                resultDetailService.deleteResultDetailByRecordId(recordId);
+                for(ResultDetail detail : resultDetails){
+                    resultScoreService.deleteResultScoreByDetailId(detail.getId());
+                }
+                return R.ok();
+            }
+            //删除指标以外的所有数据，评分、评分说明、结果
+
+            for(ResultDetail detail : resultDetails){
+                detail.setCheckResult(null);
+                detail.setAcquireScore(null);
+                detail.setSuperScore(null);
+                resultScoreService.deleteResultScoreByDetailId(detail.getId());
+            }
+            resultDetailService.updateBatchById(resultDetails);
+            return R.ok();
         }
+        return R.error("无数据删除");
 
     }
 }