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 4f51d89e..cf35373d 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -411,6 +411,9 @@ public class ResultRecordController extends AbstractController { setCalculateValue(calculateModels, model); ResultRecortModelDto resultRecortModelDto = new ResultRecortModelDto(); BeanUtils.copyProperties(model, resultRecortModelDto); + if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的 + resultRecortModelDto.setWeight(null); + } List detailDtos = resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType()); for (ResultDetailDto dto:detailDtos @@ -614,7 +617,9 @@ public class ResultRecordController extends AbstractController { } } - if(weight.compareTo(model.getWeight()) == 1){ + //下面不限权重的,计算权重之和是否超标 + 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)) + "%"); } } diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java index fd3876c4..7c117d67 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java @@ -107,9 +107,14 @@ public class ResultModelServiceImpl extends ServiceImpl 0){ updates.add(resultTagetLib); }else{ @@ -170,6 +181,18 @@ public class ResultModelServiceImpl extends ServiceImpl