wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-12-18 10:53:49 +08:00
commit 2281baa016
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/lz/modules/app/dto/ApprovalDto.java
View File

@ -13,4 +13,5 @@ public class ApprovalDto {
private Long flowRecordId;// 流程 id private Long flowRecordId;// 流程 id
private int resetFlag; private int resetFlag;
private int clearFlag;//0 全清，1 还是保留指标 private int clearFlag;//0 全清，1 还是保留指标
private Long commentId;
} }

19
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -143,6 +143,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
@Autowired @Autowired
private ResultScoreService resultScoreService; private ResultScoreService resultScoreService;
@Override @Override
public ResultRecord selectResultRecordById(Long id) { public ResultRecord selectResultRecordById(Long id) {
return resultRecordMapper.selectResultRecordById(id); return resultRecordMapper.selectResultRecordById(id);
@ -1067,12 +1068,24 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
StaffEntity staffEntity = staffService.selectStaffById(approvalDto.getLoginUserId()); StaffEntity staffEntity = staffService.selectStaffById(approvalDto.getLoginUserId());
if (staffEntity != null) { if (staffEntity != null) {
ResultComment resultComment = new ResultComment(); ResultComment resultComment = new ResultComment();
resultComment.setComment(approvalDto.getComment()); if(approvalDto.getCommentId() !=null && approvalDto.getCommentId() > 0 ){
log.info("更新前评论commentId=" + approvalDto.getCommentId());
resultComment = resultCommentService.selectResultCommentById(approvalDto.getCommentId());
}
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());
resultCommentService.insertResultComment(resultComment); if (approvalDto.getCommentId() !=null && approvalDto.getCommentId() > 0 ){
resultCommentService.updateResultCommentById(resultComment);
log.info("更新后评论commentId=" + resultComment.getId());
}else{
resultCommentService.insertResultComment(resultComment);
log.info("插入后评论commentId=" + resultComment.getId());
}
return resultComment.getId(); return resultComment.getId();
} }
return 0l; return 0l;