diff --git a/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java b/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java index efeaa3b3..6993f557 100644 --- a/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java +++ b/src/main/java/com/lz/modules/performance/enums/ProcessRecordEnum.java @@ -6,14 +6,23 @@ package com.lz.modules.performance.enums; * @Date: 2020/12/9 14:08 */ public enum ProcessRecordEnum { - NAME(1,"修改名称"), - PROCESS(2,"修改进度"), - ALL(3,"全部修改"), - ADD(4,"增加"), - DELETE(5,"删除"), + NAME(1,"更新了名称"), + PROCESS(2,"更新了进度"), + ALL(3,"更新了名称和进度"), + ADD(4,"增加了任务"), + DELETE(5,"删除了任务"), ; + public static ProcessRecordEnum findByType(int type){ + for(ProcessRecordEnum recordEnum:ProcessRecordEnum.values()){ + if(type == recordEnum.getType()){ + return recordEnum; + } + } + return null; + + } private int type; private String desc; 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 135068c6..83b9e5db 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 @@ -111,11 +111,12 @@ public class ResultTaskServiceImpl extends ServiceImpl { TaskProcessRecordDto taskProcessRecordDto = taskProcessRecordMapper.selectTaskProcessRecordLastByTaskId(resultTaskDto.getId()); if(taskProcessRecordDto != null){ - resultTaskDto.setStaffName(taskProcessRecordDto.getStaffName()); - resultTaskDto.setLabel(taskProcessRecordDto.getLabel()); + ProcessRecordEnum byType = ProcessRecordEnum.findByType(taskProcessRecordDto.getType()); + Optional.ofNullable(byType).ifPresent(processRecordEnum -> resultTaskDto.setLabel(byType.getDesc())); if(finalStaffEntity !=null){ resultTaskDto.setAvatar(finalStaffEntity.getAvatar()); - } + resultTaskDto.setStaffName(finalStaffEntity.getName()); + } } });