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-14 18:38:48 +08:00
parent b93f66c56c
commit 91fe46fdcc
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,6 +110,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId()); TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId());
if(taskProcessRecordDto != null){ if(taskProcessRecordDto != null){
//resultTaskDto.setLabel(taskProcessRecordDto.getLabel()); //resultTaskDto.setLabel(taskProcessRecordDto.getLabel());
if(taskProcessRecordDto.getUseType()==0){
ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType());
Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setTypeDesc(byType.getDesc())); Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setTypeDesc(byType.getDesc()));
if(finalStaffEntity !=null){ if(finalStaffEntity !=null){
@ -117,6 +118,18 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
resultTaskDto.setStaffName(finalStaffEntity.getName()); resultTaskDto.setStaffName(finalStaffEntity.getName());
} }
} }
if(taskProcessRecordDto.getUseType()==1){
resultTaskDto.setTypeDesc(taskProcessRecordDto.getLabel());
StaffEntity staffEntity1 = staffService.selectStaffById(taskProcessRecordDto.getStaffId());
if(staffEntity1 !=null){
resultTaskDto.setAvatar(staffEntity1.getAvatar());
resultTaskDto.setStaffName(staffEntity1.getName());
}
}
}
}); });
} }

9
src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java
View File

@ -140,9 +140,16 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
}); });
Optional.ofNullable(staffOccupationByStaffId).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition())); Optional.ofNullable(staffOccupationByStaffId).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition()));
if (dto.getUseType()==1 && dto.getStaffId().equals(req.getStaffId())) { if (dto.getUseType()==1 ) {
if(dto.getStaffId().equals(req.getStaffId())){
dto.setIsSelf(1); dto.setIsSelf(1);
} }
staffEntity = staffService.selectStaffById(dto.getStaffId());
Optional.ofNullable(staffEntity).ifPresent(staffEntity12 -> {
dto.setAvatar(staffEntity12.getAvatar());
dto.setStaffName(staffEntity12.getName());
});
}
} }
} }