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-10 17:21:15 +08:00
parent 6ce4f4379c
commit 0746a5b86c
2 changed files with 4 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/performance/service/ResultTaskService.java
View File

@ -44,5 +44,6 @@ public interface ResultTaskService extends IService<ResultTask> {
List<ResultTask> selectResultTasksByDetailId(Long detailId); List<ResultTask> selectResultTasksByDetailId(Long detailId);
void deleteTask(Long taskId); void deleteTask(Long taskId);
List<ResultTaskDto> selectResultTaskDtosByDetailId(Long detailId); List<ResultTaskDto> selectResultTaskDtosByDetailId(Long detailId);
} }

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

@ -187,7 +187,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
//新增操作 //新增操作
if(before == null){ if(before == null){
taskProcessRecord.setType(ProcessRecordEnum.ADD.getType()); taskProcessRecord.setType(ProcessRecordEnum.ADD.getType());
taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + "进度：" + after.getProcessRate()); taskProcessRecord.setLabel("新增key Results名称：" + after.getName() + "进度：" + BigDecimalUtil.mul(after.getProcessRate(),BigDecimal.valueOf(100) + "%");
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue(); return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
} }
taskProcessRecord.setTaskId(before.getId()); taskProcessRecord.setTaskId(before.getId());
@ -196,7 +196,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
if(before.getProcessRate().equals(after.getProcessRate())){ if(before.getProcessRate().equals(after.getProcessRate())){
taskProcessRecord.setType(ProcessRecordEnum.ALL.getType()); taskProcessRecord.setType(ProcessRecordEnum.ALL.getType());
taskProcessRecord.setLabel("将key Results名称：" + before.getName() + "改为" + after.getName() + "\n" taskProcessRecord.setLabel("将key Results名称：" + before.getName() + "改为" + after.getName() + "\n"
+ "进度：" + before.getProcessRate() + "改为" + after.getProcessRate()); + "进度：" + BigDecimalUtil.mul(before.getProcessRate(),BigDecimal.valueOf(100) + "%" + "改为" + BigDecimalUtil.mul(after.getProcessRate(),BigDecimal.valueOf(100) + "%");
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue(); return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
} }
@ -207,7 +207,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
} }
if(before.getProcessRate().equals(after.getProcessRate())){ if(before.getProcessRate().equals(after.getProcessRate())){
taskProcessRecord.setType(ProcessRecordEnum.PROCESS.getType()); taskProcessRecord.setType(ProcessRecordEnum.PROCESS.getType());
taskProcessRecord.setLabel("将" +before.getName() + "得进度由" + before.getProcessRate() + "更新为：" + after.getProcessRate()); taskProcessRecord.setLabel("将" +before.getName() + "得进度由" + BigDecimalUtil.mul(before.getProcessRate(),BigDecimal.valueOf(100) + "%" + "更新为：" + BigDecimalUtil.mul(after.getProcessRate(),BigDecimal.valueOf(100) + "%");
return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue(); return taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord).intValue();
} }
return -1; return -1;