diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 277421e0..d2ea4ebd 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -110,12 +110,25 @@ public class ResultTaskServiceImpl extends ServiceImpl resultTaskDto.setTypeDesc(byType.getDesc())); - if(finalStaffEntity !=null){ - resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); - resultTaskDto.setStaffName(finalStaffEntity.getName()); + if(taskProcessRecordDto.getUseType()==0){ + ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); + Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setTypeDesc(byType.getDesc())); + if(finalStaffEntity !=null){ + resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); + 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()); + } + + } + + } }); diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index 23c9aae6..f07449bd 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -140,8 +140,15 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dto.setPosition(staffOccupationEntity.getPosition())); - if (dto.getUseType()==1 && dto.getStaffId().equals(req.getStaffId())) { - dto.setIsSelf(1); + if (dto.getUseType()==1 ) { + if(dto.getStaffId().equals(req.getStaffId())){ + dto.setIsSelf(1); + } + staffEntity = staffService.selectStaffById(dto.getStaffId()); + Optional.ofNullable(staffEntity).ifPresent(staffEntity12 -> { + dto.setAvatar(staffEntity12.getAvatar()); + dto.setStaffName(staffEntity12.getName()); + }); } }