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

fxi

Browse Source
This commit is contained in:
杜建超 2020-12-10 18:50:33 +08:00
parent 091f8119c1
commit 6716964d5b
1 changed files with 9 additions and 4 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/TaskProcessRecordServiceImpl.java
View File

@ -84,8 +84,10 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
@Override @Override
public PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req) { public PageUtils selectTaskProcessRecordsByTaskId(ChangeTaskListReq req) {
Long taskId = req.getTaskId();
Long detailId = req.getDetailId();
PageUtils pageUtils = new PageUtils(); PageUtils pageUtils = new PageUtils();
if(req.getDetailId()!=null){ if(detailId!=null){
List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(req.getDetailId()); List<ResultTaskDto> resultTaskDtos = resultTaskService.selectResultTaskDtosByDetailId(req.getDetailId());
if(CollectionUtils.isNotEmpty(resultTaskDtos)){ if(CollectionUtils.isNotEmpty(resultTaskDtos)){
List<Long> collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList()); List<Long> collect = resultTaskDtos.stream().map(resultTaskDto -> resultTaskDto.getId()).collect(Collectors.toList());
@ -103,9 +105,12 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
List list = pageUtils.getList(); List list = pageUtils.getList();
if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
Long taskId = req.getTaskId();
ResultTask resultTask = resultTaskService.selectResultTaskById(taskId); if(detailId == null){
ResultDetail resultDetail = resultDetailService.selectResultDetailById(resultTask.getDetailId()); ResultTask resultTask = resultTaskService.selectResultTaskById(taskId);
detailId = resultTask.getDetailId();
}
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId()); StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
List<TaskProcessRecordDto> dtos = list; List<TaskProcessRecordDto> dtos = list;
for(TaskProcessRecordDto dto:dtos){ for(TaskProcessRecordDto dto:dtos){