diff --git a/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java b/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java index 6578cde..08fb3e9 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java +++ b/src/main/java/com/gxwebsoft/oa/controller/TaskRecordController.java @@ -73,9 +73,11 @@ public class TaskRecordController extends BaseController { Task task = taskService.getById(taskRecord.getTaskId()); if (CommonUtil.hasRole(loginUser.getRoles(),"staff") && task.getProgress().equals(PENDING)) { task.setProgress(PROCESSING); - task.setUpdateTime(new Date()); - taskService.updateById(task); } + task.setUpdateTime(new Date()); + task.setContent(taskRecord.getContent()); + task.setLastAvatar(loginUser.getAvatar()); + taskService.updateById(task); } if (taskRecordService.save(taskRecord)) { return success("添加成功"); diff --git a/src/main/java/com/gxwebsoft/oa/entity/Task.java b/src/main/java/com/gxwebsoft/oa/entity/Task.java index 6cfb11e..7f94eda 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/Task.java +++ b/src/main/java/com/gxwebsoft/oa/entity/Task.java @@ -1,18 +1,14 @@ package com.gxwebsoft.oa.entity; import com.baomidou.mybatisplus.annotation.*; - -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.io.Serializable; -import java.util.Date; - -import com.gxwebsoft.common.system.entity.User; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; + /** * 任务记录表 * @@ -93,6 +89,9 @@ public class Task implements Serializable { @ApiModelProperty(value = "最后回复人") private Integer lastReadUser; + @ApiModelProperty(value = "最后回复人的头像") + private String lastAvatar; + @ApiModelProperty(value = "排序(数字越小越靠前)") private Integer sortNumber;