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 e4d4ab94..78a6b21b 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -777,7 +777,7 @@ public class ResultRecordController extends AbstractController { ResultDetail resultDetail = new ResultDetail(); BeanUtils.copyProperties(detailDto, resultDetail); - if(resultDetail.getIsDelete().intValue() == 1){//被删除了 + if(resultDetail.getIsDelete() != null && resultDetail.getIsDelete().intValue() == 1){//被删除了 resultDetail.setIsBack(2); resultDetail.setBackId(resultDetail.getId()); updateResultDetails.add(resultDetail); @@ -901,29 +901,33 @@ public class ResultRecordController extends AbstractController { if(resultDetail != null){ log.info("修改后的对象为{}", resultDetail1); boolean isUp = false; + String value = ""; + String heard = ""; if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ //打上标识 - commandValue += ("(修改) 名称:" + + value += ("(修改) 名称:" + resultDetail1.getTarget()+ " 为:" + resultDetail.getTarget() + "\r\n"); isUp = true; + }else{ + heard = resultDetail1.getTarget() + ":\r\n"; } if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 - commandValue += ("(修改) 考核标准:" + + value += ("(修改) 考核标准:" + resultDetail1.getKeyResult() + " 为:" + resultDetail.getTarget() + "\r\n"); isUp = true; } if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ //打上标识 - commandValue += ("(修改) 权重:" + + value += ("(修改) 权重:" + resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为:" + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\r\n"); isUp = true; } if(isUp){ - commandValue = commandValue + ":" + commandValue; + commandValue += (commandIndex + ":" + heard + value); commandIndex++; resultDetail1.setIsBack(1); }