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 a4853267..620608ca 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -754,7 +754,33 @@ public class ResultRecordController extends AbstractController { BeanUtils.copyProperties(detailDto, resultDetail); if(!isSetKeyResult && resultDetail.getId() != null && mapDetails.containsKey(resultDetail.getId())){ //这里判断是否有更新,或者删除 + ResultDetail resultDetail1 = mapDetails.get(resultDetail.getId()); + boolean isUp = false; + if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ + //打上标识 + isUp = true; + } + + if(!resultDetail.getCheckResult().equals(resultDetail1.getCheckResult())){ + //打上标识 + isUp = true; + resultDetail1.setCheckResult("" + resultDetail1.getCheckResult() + ""); + } + + if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ + //打上标识 + isUp = true; + + //resultDetail1.setTarget("" + resultDetail1.getTarget() + ""); + } + if(isUp){ + resultDetail1.setId(null); + resultDetail1.setIsBack(1); + resultDetail1.setTarget("" + resultDetail1.getTarget() + ""); + resultDetail1.setBackId(resultDetail.getId()); + inserts.add(resultDetail); + } } resultDetail.setPriority(index); diff --git a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java index 29bb213c..157816c3 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultScoreDto.java @@ -43,6 +43,10 @@ public class ResultScoreDto { //评分说明 @ApiModelProperty(value = "评分说明", name = "scoreComment") private String scoreComment; + + //根据权重计算除的实际得分 + @ApiModelProperty(value = "根据权重计算除的实际得分", name = "score") + private BigDecimal score; /** * * @return