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 17:16:33 +08:00
parent 782132ad3b
commit d6c1a0f9c3
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,18 @@ package com.lz.modules.performance.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lz.common.utils.PageUtils;
import com.lz.modules.app.entity.StaffEntity;
import com.lz.modules.app.service.StaffService;
import com.lz.modules.performance.dao.TaskProcessRecordMapper;
import com.lz.modules.performance.dto.TaskProcessRecordDto;
import com.lz.modules.performance.entity.ResultTask;
import com.lz.modules.performance.entity.TaskProcessRecord;
import com.lz.modules.performance.req.ChangeTaskListReq;
import com.lz.modules.performance.service.ResultTaskService;
import com.lz.modules.performance.service.TaskProcessRecordService;
import com.lz.modules.sys.entity.app.ResultDetail;
import com.lz.modules.sys.service.app.ResultDetailService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -27,6 +35,15 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
@Autowired
private TaskProcessRecordMapper taskProcessRecordMapper;
@Autowired
private ResultTaskService resultTaskService;
@Autowired
private ResultDetailService resultDetailService;
@Autowired
private StaffService staffService;
@Override
@ -67,6 +84,18 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
PageUtils pageUtils = PageUtils.startPage(req.getCurrPage(),req.getPageSize()).doSelect(
page -> taskProcessRecordMapper.selectTaskProcessRecordsByTaskId(page, req.getTaskId())
);
List list = pageUtils.getList();
if(CollectionUtils.isNotEmpty(list)){
Long taskId = req.getTaskId();
ResultTask resultTask = resultTaskService.selectResultTaskById(taskId);
ResultDetail resultDetail = resultDetailService.selectResultDetailById(resultTask.getDetailId());
StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
List<TaskProcessRecordDto> dtos = list;
for(TaskProcessRecordDto dto:dtos){
dto.setAvatar(staffEntity.getAvatar());
dto.setStaffName(staffEntity.getName());
}
}
return pageUtils;
}