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-11 14:35:57 +08:00
parent f51bf5a98b
commit baed7fe436
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java
View File

@ -40,4 +40,7 @@ public class TaskProcessRecordDto {
//1，修改名称，2修改进度 ，3名称和进度都修改 //1，修改名称，2修改进度 ，3名称和进度都修改
@ApiModelProperty(value = "0表示记录，不传全部", name = "useType") @ApiModelProperty(value = "0表示记录，不传全部", name = "useType")
private Integer useType; private Integer useType;
//1，修改名称，2修改进度 ，3名称和进度都修改
@ApiModelProperty(value = "职位", name = "position")
private String position;
} }

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

@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.lz.common.utils.PageUtils; import com.lz.common.utils.PageUtils;
import com.lz.modules.app.entity.StaffEntity; 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.model.TaskModel;
import com.lz.modules.app.service.StaffOccupationService;
import com.lz.modules.app.service.StaffService; import com.lz.modules.app.service.StaffService;
import com.lz.modules.performance.dao.TaskProcessRecordMapper; import com.lz.modules.performance.dao.TaskProcessRecordMapper;
import com.lz.modules.performance.dto.ResultTaskDto; import com.lz.modules.performance.dto.ResultTaskDto;
@ -53,6 +55,8 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
@Autowired @Autowired
private StaffService staffService; private StaffService staffService;
@Autowired
private StaffOccupationService staffOccupationService;
@ -119,6 +123,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
} }
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId); ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId()); StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId());
StaffOccupationEntity staffOccupationByStaffId = staffOccupationService.getStaffOccupationByStaffId(resultDetail.getStaffId());
List<TaskProcessRecordDto> dtos = list; List<TaskProcessRecordDto> dtos = list;
for(TaskProcessRecordDto dto:dtos){ for(TaskProcessRecordDto dto:dtos){
dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc()); dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc());
@ -126,6 +131,7 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
dto.setAvatar(staffEntity1.getAvatar()); dto.setAvatar(staffEntity1.getAvatar());
dto.setStaffName(staffEntity1.getName()); dto.setStaffName(staffEntity1.getName());
}); });
Optional.ofNullable(staffOccupationByStaffId).ifPresent(staffOccupationEntity -> dto.setPosition(staffOccupationEntity.getPosition()));
} }

3
src/main/resources/mapper/performance/TaskProcessRecordMapper.xml
View File

@ -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 * 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> </select>
<<<<<<< HEAD
=======
<select id="selectCommentTaskProcessRecordByDetailId" resultType="TaskProcessRecord" > <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 * from lz_task_process_record where detail_id=#{detailId} and is_delete = 0 and use_type=1 order by id desc limit 1
</select> </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 * from lz_task_process_record where task_id=#{taskId} and is_delete = 0 and use_type=1 order by id desc limit 1
</select> </select>
>>>>>>> 0759c9bb2ac2d85becab14db3150110f2bf20e63
</mapper> </mapper>