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

---
 .../lz/modules/performance/dto/TaskProcessRecordDto.java    | 3 +++
 .../service/impl/TaskProcessRecordServiceImpl.java          | 6 ++++++
 .../mapper/performance/TaskProcessRecordMapper.xml          | 3 ---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java
index 84d88c14..9a116d23 100644
--- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java
+++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java
@@ -40,4 +40,7 @@ public class TaskProcessRecordDto {
     //1，修改名称，2修改进度  ，3名称和进度都修改
     @ApiModelProperty(value = "0表示记录，不传全部", name = "useType")
     private Integer useType;
+    //1，修改名称，2修改进度  ，3名称和进度都修改
+    @ApiModelProperty(value = "职位", name = "position")
+    private String position;
 }
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 b5f89af7..5a26601f 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
@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.lz.common.utils.PageUtils;
 import com.lz.modules.app.entity.StaffEntity;
+import com.lz.modules.app.entity.StaffOccupationEntity;
 import com.lz.modules.app.model.TaskModel;
+import com.lz.modules.app.service.StaffOccupationService;
 import com.lz.modules.app.service.StaffService;
 import com.lz.modules.performance.dao.TaskProcessRecordMapper;
 import com.lz.modules.performance.dto.ResultTaskDto;
@@ -53,6 +55,8 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 
     @Autowired
 	private StaffService staffService;
+    @Autowired
+	private StaffOccupationService staffOccupationService;
 
 
 
@@ -119,6 +123,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
 			}
 			ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
 			StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
+			StaffOccupationEntity staffOccupationByStaffId = staffOccupationService.getStaffOccupationByStaffId(resultDetail.getStaffId());
 			List<TaskProcessRecordDto> dtos = list;
 			for(TaskProcessRecordDto dto:dtos){
 				dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc());
@@ -126,6 +131,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
                     dto.setAvatar(staffEntity1.getAvatar());
                     dto.setStaffName(staffEntity1.getName());
                 });
+				Optional.ofNullable(staffOccupationByStaffId).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition()));
 
 			}
 
diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
index 91df1ed4..aed9a059 100644
--- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
+++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
@@ -165,8 +165,6 @@
         select * from lz_task_process_record  where is_delete = 0 and (detail_id = #{taskModel.detailId} or task_id=#{taskModel.taskId} ) and use_type=#{taskModel.useType} order by id desc
     </select>
 
-<<<<<<< HEAD
-=======
     <select id="selectCommentTaskProcessRecordByDetailId" resultType="TaskProcessRecord" >
         select * from lz_task_process_record  where detail_id=#{detailId} and is_delete = 0 and use_type=1 order by id desc  limit 1
     </select>
@@ -175,6 +173,5 @@
         select * from lz_task_process_record  where task_id=#{taskId} and is_delete = 0 and use_type=1 order by id desc limit 1
     </select>
 
->>>>>>> 0759c9bb2ac2d85becab14db3150110f2bf20e63
 </mapper>