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 11:12:07 +08:00
parent 980f658dc6
commit a663ff3da2
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,4 +34,10 @@ public class TaskProcessRecordDto {
//标签 //标签
@ApiModelProperty(value = "类型", name = "描述") @ApiModelProperty(value = "类型", name = "描述")
private String typeDesc; private String typeDesc;
//操作标签
@ApiModelProperty(value = "任务名称", name = "name")
private String name;
//1，修改名称，2修改进度 ，3名称和进度都修改
@ApiModelProperty(value = "0表示记录，1 表示评论", name = "useType")
private Integer useType;
} }

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

@ -11,6 +11,7 @@ import com.lz.modules.performance.dto.ResultTaskDto;
import com.lz.modules.performance.dto.TaskProcessRecordDto; import com.lz.modules.performance.dto.TaskProcessRecordDto;
import com.lz.modules.performance.entity.ResultTask; import com.lz.modules.performance.entity.ResultTask;
import com.lz.modules.performance.entity.TaskProcessRecord; import com.lz.modules.performance.entity.TaskProcessRecord;
import com.lz.modules.performance.enums.ProcessRecordEnum;
import com.lz.modules.performance.req.ChangeTaskListReq; import com.lz.modules.performance.req.ChangeTaskListReq;
import com.lz.modules.performance.service.ResultTaskService; import com.lz.modules.performance.service.ResultTaskService;
import com.lz.modules.performance.service.TaskProcessRecordService; import com.lz.modules.performance.service.TaskProcessRecordService;
@ -118,12 +119,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
StaffEntity staffEntity = staffService.selectStaffById(resultDetail.getStaffId()); StaffEntity staffEntity = staffService.selectStaffById(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());
Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> { Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> {
dto.setAvatar(staffEntity1.getAvatar()); dto.setAvatar(staffEntity1.getAvatar());
dto.setStaffName(staffEntity1.getName()); dto.setStaffName(staffEntity1.getName());
}); });
} }
} }
return pageUtils; return pageUtils;
} }

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

@ -129,7 +129,7 @@
</update> </update>
<select id="selectTaskProcessRecordsByTaskId" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto"> <select id="selectTaskProcessRecordsByTaskId" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
select gmt_create,remark,label,type from lz_task_process_record where task_id=#{taskId} and use_type = #{useType} and is_delete = 0 order by gmt_create desc select gmt_create,remark,label,type,name,use_type from lz_task_process_record where task_id=#{taskId} and use_type = #{useType} and is_delete = 0 order by gmt_create desc
</select> </select>
<update id="deleteTaskProcessRecordsByTaskId" parameterType="java.lang.Long"> <update id="deleteTaskProcessRecordsByTaskId" parameterType="java.lang.Long">