From d6c1a0f9c3e9a18d15f89c7de54d736eed3d7203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Wed, 9 Dec 2020 17:16:33 +0800
Subject: [PATCH] fix

---
 .../impl/TaskProcessRecordServiceImpl.java    | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

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 30bfd385..640d9faa 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
@@ -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;
 	}