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 19e7b624..3cb8543a 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -590,24 +590,27 @@ public class ResultRecordController extends AbstractController { } if(resultDetail.getIsDelete() == null || resultDetail.getIsDelete().intValue() == 0){ BigDecimal score = BigDecimal.ZERO; - for (ResultScoreDto scoreDto:detailDto.getScoreDtos() - ) { - //计算得分 - ResultScore resultScore = new ResultScore(); - BeanUtils.copyProperties(scoreDto, resultScore); - if(scoreDto.getAcquireScore() != null){ - score = score.add(scoreDto.getAcquireScore().multiply(scoreDto.getWeight())); + if(detailDto.getScoreDtos() != null){ + for (ResultScoreDto scoreDto:detailDto.getScoreDtos() + ) { + //计算得分 + ResultScore resultScore = new ResultScore(); + BeanUtils.copyProperties(scoreDto, resultScore); + if(scoreDto.getAcquireScore() != null){ + score = score.add(scoreDto.getAcquireScore().multiply(scoreDto.getWeight())); + } + if(resultScore.getId() == null){ + insertScores.add(resultScore); + }else{ + updateScores.add(resultScore); + } } - if(resultScore.getId() == null){ - insertScores.add(resultScore); - }else{ - updateScores.add(resultScore); - } - } - resultDetail.setAcquireScore(score); - weight = weight.add(resultDetail.getCheckWeight()); + resultDetail.setAcquireScore(score); + weight = weight.add(resultDetail.getCheckWeight()); + } } + } if(weight.compareTo(model.getWeight()) == 1){ return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");