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-11-13 11:46:45 +08:00
parent 42a022cbca
commit f4e4f74276
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lz/modules/performance/dto/TaskListDto.java
View File

@ -14,9 +14,9 @@ public class TaskListDto {
private Long recordId; private Long recordId;
private Long staffId; private Long recordStaffId;
private Long currentApprovalStaffId; private Long approvalStaffId;
private Long startId; private Long startId;

4
src/main/java/com/lz/modules/performance/service/impl/AssessServiceImpl.java
View File

@ -68,10 +68,10 @@ public class AssessServiceImpl implements AssessService {
List<TaskListDto> dtos = pageUtils.getList(); List<TaskListDto> dtos = pageUtils.getList();
dtos.stream().forEach(taskListDto -> { dtos.stream().forEach(taskListDto -> {
TaskListRes res = new TaskListRes(); TaskListRes res = new TaskListRes();
StaffEntity staffEntity = staffService.selectStaffById(taskListDto.getStaffId()); StaffEntity staffEntity = staffService.selectStaffById(taskListDto.getRecordStaffId());
res.setAvatar(Optional.ofNullable(staffEntity.getAvatar()).orElse(StringUtil.EMPTY)); res.setAvatar(Optional.ofNullable(staffEntity.getAvatar()).orElse(StringUtil.EMPTY));
String name = staffEntity.getName(); String name = staffEntity.getName();
if(taskListDto.getStaffId().equals(taskListDto.getCurrentApprovalStaffId())){ if(taskListDto.getRecordStaffId().equals(taskListDto.getApprovalStaffId())){
name = "您"; name = "您";
} }
FlowStart start = flowStartService.selectFlowStartById(taskListDto.getStartId()); FlowStart start = flowStartService.selectFlowStartById(taskListDto.getStartId());

2
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -186,7 +186,7 @@
</select> </select>
<select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto"> <select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
SELECT DISTINCT(record_id),f.flow_process,f.flow_name,current_approval_staff_id,staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r LEFT JOIN lz_result_record r
ON f.record_id = r.id ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0 where f.is_delete=0 and r.is_delete=0