提交修改

This commit is contained in:
quyixiao 2020-12-18 10:44:03 +08:00
parent 5bffca00ef
commit fb76d5f9de

View File

@ -1072,12 +1072,14 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
log.info("更新前评论commentId=" + approvalDto.getCommentId()); log.info("更新前评论commentId=" + approvalDto.getCommentId());
resultComment = resultCommentService.selectResultCommentById(approvalDto.getCommentId()); resultComment = resultCommentService.selectResultCommentById(approvalDto.getCommentId());
} }
resultComment.setComment(approvalDto.getComment()); String comment = StringUtil.isNotBlank(resultComment.getComment()) ? resultComment.getComment() + "_" : "";
String optDesc = StringUtil.isNotBlank(resultComment.getOptDesc()) ? resultComment.getOptDesc() + "_" : "";
resultComment.setComment(comment + approvalDto.getComment());
resultComment.setStaffName(staffEntity.getName()); resultComment.setStaffName(staffEntity.getName());
resultComment.setStaffId(staffEntity.getId()); resultComment.setStaffId(staffEntity.getId());
resultComment.setRecordId(approvalDto.getResultRecordId()); resultComment.setRecordId(approvalDto.getResultRecordId());
resultComment.setOptDesc(approvalDto.getMenuName() + flowChart.getName()); resultComment.setOptDesc(optDesc + approvalDto.getMenuName() + flowChart.getName());
if(approvalDto.getCommentId() !=null && approvalDto.getCommentId() > 0 ){ if (approvalDto.getCommentId() !=null && approvalDto.getCommentId() > 0 ){
resultCommentService.updateResultCommentById(resultComment); resultCommentService.updateResultCommentById(resultComment);
log.info("更新后评论commentId=" + resultComment.getId()); log.info("更新后评论commentId=" + resultComment.getId());
}else{ }else{