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 22b05175..cf508106 100644 --- a/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java +++ b/src/main/java/com/lz/modules/performance/dto/TaskProcessRecordDto.java @@ -34,4 +34,10 @@ public class TaskProcessRecordDto { //标签 @ApiModelProperty(value = "类型", name = "描述") private String typeDesc; + //操作标签 + @ApiModelProperty(value = "任务名称", name = "name") + private String name; + //1,修改名称,2修改进度 ,3名称和进度都修改 + @ApiModelProperty(value = "0表示记录,1 表示评论", name = "useType") + private Integer useType; } 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 5327af7b..8aee427d 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 @@ -11,6 +11,7 @@ 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; import com.lz.modules.performance.req.ChangeTaskListReq; import com.lz.modules.performance.service.ResultTaskService; import com.lz.modules.performance.service.TaskProcessRecordService; @@ -118,12 +119,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl dtos = list; for(TaskProcessRecordDto dto:dtos){ + dto.setTypeDesc(ProcessRecordEnum.findByType(dto.getType()).getDesc()); Optional.ofNullable(staffEntity).ifPresent(staffEntity1 -> { dto.setAvatar(staffEntity1.getAvatar()); dto.setStaffName(staffEntity1.getName()); }); } + } return pageUtils; } diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index 66ddb0d8..f7b14bc7 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -129,7 +129,7 @@