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/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index 38eb67af..e75e886a 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -191,10 +191,12 @@ public class ResultTaskServiceImpl 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 25a4878d..d3daae82 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -131,7 +131,7 @@