From 4decad63c17a0e5789f3b81e166115958ec1e159 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 5 Nov 2020 17:10:16 +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=E9=A1=B5=E5=8E=BB=E6=8E=89=E5=AF=B9=E6=9D=83=E9=87=8D?= =?UTF-8?q?=E4=B9=8B=E5=92=8C=E7=9A=84=E9=99=90=E5=88=B6?= 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, 3 insertions(+), 3 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 e4bd1a33..5a799c51 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -581,7 +581,7 @@ public class ResultRecordController extends AbstractController { int index = 0; BigDecimal weight = BigDecimal.ZERO; if(model.getDetailDtos().size() > model.getMaxCount().intValue()){ - return R.error(model.getName() + "维度指标不能超过" + model.getMaxCount()); + return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount()); } for (ResultDetailDto detailDto:model.getDetailDtos() ) {//排序 @@ -624,10 +624,10 @@ public class ResultRecordController extends AbstractController { } //下面不限权重的，计算权重之和是否超标 - if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 + /*if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 && weight.compareTo(model.getWeight()) == 1){ return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%"); - } + }*/ } //下面更新指标记录 if(inserts.size() > 0){