fix

src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java

@@ -38,4 +38,6 @@ public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
 
 
     int deleteTaskProcessRecordsByTaskId(@Param("taskId") Long taskId);
+
+	TaskProcessRecordDto selectTaskProcessRecordLastByTaskId(@Param("taskId") Long taskId);
 }

src/main/java/com/lz/modules/performance/res/ResultTaskDetailRes.java

@@ -28,4 +28,13 @@ public class ResultTaskDetailRes {
     //任务列表
     @ApiModelProperty(value = "集体进度", name = "resultTasks")
     private List<ResultTaskDto> resultTasks;
+    //头像
+    @ApiModelProperty(value = "头像", name = "avatar")
+    private String avatar;
+    //姓名
+    @ApiModelProperty(value = "姓名", name = "staffName")
+    private String staffName;
+    //标签
+    @ApiModelProperty(value = "标签", name = "label")
+    private String label;
 }

src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java

@@ -2,8 +2,12 @@ package com.lz.modules.performance.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lz.common.utils.BigDecimalUtil;
+import com.lz.modules.app.entity.StaffEntity;
+import com.lz.modules.app.service.StaffService;
 import com.lz.modules.performance.dao.ResultTaskMapper;
+import com.lz.modules.performance.dao.TaskProcessRecordMapper;
 import com.lz.modules.performance.dto.ResultTaskDto;
+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.enums.ProcessRecordEnum;
@@ -47,6 +51,10 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 	private TaskCommentService taskCommentService;
     @Autowired
 	private TaskProcessRecordService taskProcessRecordService;
+    @Autowired
+	private TaskProcessRecordMapper taskProcessRecordMapper;
+    @Autowired
+	private StaffService staffService;
 
 
 
@@ -90,9 +98,22 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		Optional.ofNullable(resultDetail).ifPresent(resultDetail1 -> {
             res.setProcessRate(resultDetail1.getProcessRate());
             res.setTarget(resultDetail1.getTarget());
-        });
+			Long staffId = resultDetail.getStaffId();
+			StaffEntity staffEntity = staffService.selectStaffById(staffId);
+			res.setAvatar(staffEntity.getAvatar());
+		});
 		List<ResultTaskDto> resultTasks = resultTaskMapper.selectResultTaskDtosByDetailId(detailId);
 		res.setResultTasks(resultTasks);
+		//获取最近更新记录
+		if(CollectionUtils.isNotEmpty(resultTasks)){
+			ResultTaskDto dto = resultTasks.get(resultTasks.size() - 1);
+			TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(dto.getId());
+			if(taskProcessRecordDto != null){
+				res.setStaffName(taskProcessRecordDto.getStaffName());
+				res.setLabel(taskProcessRecordDto.getLabel());
+			}
+
+		}
 		return res;
 	}
 

src/main/resources/mapper/performance/TaskProcessRecordMapper.xml

@@ -102,6 +102,9 @@
         update lz_task_process_record set is_delete = 1 where task_id=#{taskId}
     </update>
 
+    <select id="selectTaskProcessRecordLastByTaskId" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
+        select gmt_create,remark,label,type from lz_task_process_record  where task_id=#{taskId} and is_delete = 0 order by id desc
+    </select>
 
 
 </mapper>