From b6d5f33cc4e891d0c8f8fa966e027779955b2ed0 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 29 Oct 2020 09:50:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B6=E5=AE=9A?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=98=AF=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/ResultRecordController.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 1944fac0..4edae00a 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -485,10 +485,14 @@ public class ResultRecordController extends AbstractController {
                 ResultDetail resultDetail = new ResultDetail();
                 BeanUtils.copyProperties(detailDto, resultDetail);
                 resultDetail.setPriority(index);
+
                 index++;
                 if(resultDetail.getId() != null){
                     updates.add(resultDetail);
                 }else{
+                    resultDetail.setStaffId(resultRecord.getStaffId());
+                    resultDetail.setRecordId(resultRecord.getId());
+                    resultDetail.setType(model.getType());
                     inserts.add(resultDetail);
                 }
             }
@@ -545,7 +549,7 @@ public class ResultRecordController extends AbstractController {
         return R.ok("删除成功");
     }
 
-    /**
+    /**lzresultrecord/saveDetail
      * 信息
      */
     @RequestMapping("/recordIdsSubmit")

From 118517d527a10f4bbe5ae83f10c8fcad19557ea0 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 29 Oct 2020 09:58:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E6=9D=83=E9=87=8D=E4=B9=8B=E5=92=8C=E4=B8=8D=E8=83=BD=E8=B6=85?=
 =?UTF-8?q?=E8=BF=87=E7=BB=B4=E5=BA=A6=E6=9D=83=E9=87=8D=E4=B9=8B=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/app/controller/ResultRecordController.java  | 7 +++++++
 1 file changed, 7 insertions(+)

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 4edae00a..e6265239 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -480,6 +480,7 @@ public class ResultRecordController extends AbstractController {
         for (ResultRecortModelDto model:dto.getRecortModelDtos()
              ) {
             int index = 0;
+            BigDecimal weight = BigDecimal.ZERO;
             for (ResultDetailDto detailDto:model.getDetailDtos()
                  ) {//排序
                 ResultDetail resultDetail = new ResultDetail();
@@ -495,6 +496,12 @@ public class ResultRecordController extends AbstractController {
                     resultDetail.setType(model.getType());
                     inserts.add(resultDetail);
                 }
+                if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){
+                    weight = weight.add(resultDetail.getCheckWeight());
+                }
+            }
+            if(weight.compareTo(model.getWeight()) == 1){
+                return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");
             }
         }
         if(inserts.size() > 0){