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

解决冲突

Browse Source
This commit is contained in:
wulin 2020-12-09 14:39:30 +08:00
commit d58d2ceb2d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
View File

@ -97,7 +97,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
public int saveOrUpdateResultTask(ResultUpdateTaskReq req) {
Long tasklId = req.getTasklId();
Long detailId = req.getDetailId();
if(tasklId==null && detailId == null){
if(tasklId == null && detailId == null){
log.error("任务保存或更新失败：tasklId, detailId都为空");
return -1;
}
@ -114,6 +114,10 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
resultTask = resultTaskMapper.selectResultTaskById(tasklId);
BeanUtils.copyProperties(req,resultTask);
resultTaskMapper.updateResultTaskById(resultTask);
int i = changeTaskProcess(resultTask, req);
if(i<1){
log.info("任务暂无变化，不做修改");
}
}
//修改总进度
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
@ -139,26 +143,28 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
}
//记录变更记录
private void changeTaskProcess(ResultTask before,ResultUpdateTaskReq after){
private int changeTaskProcess(ResultTask before,ResultUpdateTaskReq after){
TaskProcessRecord taskProcessRecord = new TaskProcessRecord();
taskProcessRecord.setTaskId(before.getId());
taskProcessRecord.setRemark(after.getRemake());
BeanUtils.copyProperties(after,taskProcessRecord);
//判断修改了名称或进度
if(before.getName().equals(after.getName())){
if(before.getProcessRate().equals(after.getProcessRate())){
taskProcessRecord.setType(ProcessRecordEnum.ALL.getType());
return;
taskProcessRecord.setLabel("将key Results名称：" + before.getName() + "改为" + after.getName() + "\n"
+ "进度：" + before.getProcessRate() + "改为" + after.getProcessRate());
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
}
taskProcessRecord.setType(ProcessRecordEnum.NAME.getType());
return;
taskProcessRecord.setLabel("将key Results名称：" + before.getName() + "改为" + after.getName());
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
}
if(before.getProcessRate().equals(after.getProcessRate())){
taskProcessRecord.setType(ProcessRecordEnum.PROCESS.getType());
taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord);
taskProcessRecord.setLabel("将" +before.getName() + "得进度由" + before.getProcessRate() + "更新为：" + after.getProcessRate());
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
}
}