From 118517d527a10f4bbe5ae83f10c8fcad19557ea0 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 29 Oct 2020 09:58:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BB=A9=E6=95=88=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=8C=87=E6=A0=87=E6=9D=83?= =?UTF-8?q?=E9=87=8D=E4=B9=8B=E5=92=8C=E4=B8=8D=E8=83=BD=E8=B6=85=E8=BF=87?= =?UTF-8?q?=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){