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

fix

Browse Source
This commit is contained in:
杜建超 2020-12-09 16:23:29 +08:00
parent a85f4a937a
commit 8bac3406fb
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java
View File

@ -9,6 +9,8 @@ public enum ProcessRecordEnum {
NAME(1,"修改名称"), NAME(1,"修改名称"),
PROCESS(2,"修改进度"), PROCESS(2,"修改进度"),
ALL(3,"全部修改"), ALL(3,"全部修改"),
ADD(4,"增加"),
DELETE(5,"删除"),
; ;

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

@ -108,6 +108,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
BeanUtils.copyProperties(req,resultTask); BeanUtils.copyProperties(req,resultTask);
resultTask.setDetailId(detailId); resultTask.setDetailId(detailId);
resultTaskMapper.insertResultTask(resultTask); resultTaskMapper.insertResultTask(resultTask);
int i = changeTaskProcess(null, req);
} }
else { else {
log.info("绩效任务修改操作。。。"); log.info("绩效任务修改操作。。。");
@ -147,6 +148,12 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
TaskProcessRecord taskProcessRecord = new TaskProcessRecord(); TaskProcessRecord taskProcessRecord = new TaskProcessRecord();
taskProcessRecord.setTaskId(before.getId()); taskProcessRecord.setTaskId(before.getId());
BeanUtils.copyProperties(after,taskProcessRecord); BeanUtils.copyProperties(after,taskProcessRecord);
//新增操作
if(before == null){
taskProcessRecord.setType(ProcessRecordEnum.ADD.getType());
taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + "进度：" + after.getProcessRate());
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
}
//判断修改了名称或进度 //判断修改了名称或进度
if(before.getName().equals(after.getName())){ if(before.getName().equals(after.getName())){
if(before.getProcessRate().equals(after.getProcessRate())){ if(before.getProcessRate().equals(after.getProcessRate())){