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 31b6d724..6eae6c67 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -815,33 +815,34 @@ public class ResultRecordController extends AbstractController { if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && resultDetail1 != null){ //有评论id if(resultDetail1.getIsDelete().intValue() == 1){ - commandValue += (commandIndex + "(删除)" + resultDetail1.getTarget() + "\r\n"); + commandValue += (commandIndex + ":(删除)" + resultDetail1.getTarget() + "\r\n"); commandIndex++; resultDetail1.setIsBack(1); }else{ boolean isUp = false; if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){ //打上标识 - commandValue += (commandIndex + "(修改) 名称:" + + commandValue += ("(修改) 名称:" + resultDetail1.getTarget()+ " 为:" + resultDetail.getTarget() + "\r\n"); isUp = true; } if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){ //打上标识 - commandValue += (commandIndex + "(修改) 考核标准:" + + commandValue += ("(修改) 考核标准:" + resultDetail1.getKeyResult() + " 为:" + resultDetail.getTarget() + "\r\n"); isUp = true; } if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){ //打上标识 - commandValue += (commandIndex + "(修改) 权重:" + + commandValue += ("(修改) 权重:" + resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为:" + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "%\r\n"); isUp = true; } if(isUp){ + commandValue = commandValue + ":" + commandValue; commandIndex++; resultDetail1.setIsBack(1); } diff --git a/src/main/resources/mapper/app/ResultCommentMapper.xml b/src/main/resources/mapper/app/ResultCommentMapper.xml index f0ec404d..8e831093 100644 --- a/src/main/resources/mapper/app/ResultCommentMapper.xml +++ b/src/main/resources/mapper/app/ResultCommentMapper.xml @@ -113,7 +113,7 @@ update lz_result_comment set - + opt_desc = '修改了目标', comment = #{commandValue} ,gmt_modified = now() where id = #{commandId} diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index f6739378..a24c4744 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -147,7 +147,7 @@ +