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:52:35 +08:00
parent 4fef586a34
commit 9920612d0d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,6 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
List list = pageUtils.getList(); List list = pageUtils.getList();
if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
if(detailId == null){ if(detailId == null){
ResultTask resultTask = resultTaskService.selectResultTaskById(taskId); ResultTask resultTask = resultTaskService.selectResultTaskById(taskId);
detailId = resultTask.getDetailId(); detailId = resultTask.getDetailId();
@ -124,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()); 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());

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

@ -149,7 +149,7 @@
<select id="selectTaskProcessRecordsByTaskIdsAndType" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto"> <select id="selectTaskProcessRecordsByTaskIdsAndType" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
select gmt_create,remark,label,type from lz_task_process_record where is_delete = 0 select gmt_create,remark,label,type,use_type from lz_task_process_record where is_delete = 0
<if test="useType !=null"> <if test="useType !=null">
and use_type = #{useType} and use_type = #{useType}
</if> </if>