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 8d0350c9..af601164 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -468,7 +468,7 @@ public class ResultRecordController extends AbstractController { List flowChartDetailRecords = flowChartDetailRecordService.selectFlowChartDetailRecordsByFlowProcess(resultRecord.getEvaluationId(), ChartFlowType.SCORE.getCode());//获取参与评分的人 - //List flowRecords = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode()); + List flowRecords1 = flowRecordService.selectFlowRecordByRecordIdFlowProcess(resultRecord.getId(), ChartFlowType.SCORE.getCode()); List staffs = new ArrayList<>(); Boolean isAllScore = true;//false表示返回所有的评分,true表示值返回评分了的人 Boolean isOrScore = false;//是否为或签 @@ -987,8 +987,8 @@ public class ResultRecordController extends AbstractController { } resultRecordService.updateResultRecordById(resultRecord); - - if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0){ + String commentId = null; + if(dto.getSave() == null && editResultDetails.size() > 0){//非暂存 //修改评论信息 log.info("修改了多少个指标{}", editResultDetails.size()); editResultDetails.addAll(resultDetailService.selectNotNoticeResultDetailByRecordId(dto.getId())) ; @@ -1058,17 +1058,13 @@ public class ResultRecordController extends AbstractController { } if(commandValue.length() > 0){ log.info("需要写入评论,具体呢容为{}", commandValue); - ResultComment resultComment = resultCommentService.selectResultCommentById(dto.getCommentId()); + ResultComment resultComment = new ResultComment();//resultCommentService.selectResultCommentById(dto.getCommentId()); log.info("resultComment的值{}", resultComment); - if(resultComment.getOptDesc().indexOf("制定了目标") >= 0){ - resultComment.setOptDesc("修改了目标"); - resultComment.setComment(commandValue); - }else{ - resultComment.setOptDesc("修改了目标-" + resultComment.getOptDesc()); + resultComment.setOptDesc("修改了目标"); + resultComment.setComment(commandValue); - resultComment.setComment((resultComment.getComment() == null ? "" : (resultComment.getComment() + "\n")) + commandValue); - } - resultCommentService.updateResultCommentById(resultComment);//.updateResultCommentCommentById(dto.getCommentId(), commandValue); + resultCommentService.insertResultComment(resultComment);//.updateResultCommentCommentById(dto.getCommentId(), commandValue); + commentId = resultComment.getId().toString(); } } }else{ @@ -1084,7 +1080,7 @@ public class ResultRecordController extends AbstractController { resultDetailService.updateBatchById(editResultDetails); } - return R.ok(); + return R.ok().put("commentId", commentId); } /** diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index 855e101d..4138331b 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -101,6 +101,7 @@ public class ResultRecordDetailDto { @ApiModelProperty(value = "职位", name = "position") private String position; + /** * * @return