优化:显示最后回复人头像
This commit is contained in:
@@ -73,9 +73,11 @@ public class TaskRecordController extends BaseController {
|
|||||||
Task task = taskService.getById(taskRecord.getTaskId());
|
Task task = taskService.getById(taskRecord.getTaskId());
|
||||||
if (CommonUtil.hasRole(loginUser.getRoles(),"staff") && task.getProgress().equals(PENDING)) {
|
if (CommonUtil.hasRole(loginUser.getRoles(),"staff") && task.getProgress().equals(PENDING)) {
|
||||||
task.setProgress(PROCESSING);
|
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)) {
|
if (taskRecordService.save(taskRecord)) {
|
||||||
return success("添加成功");
|
return success("添加成功");
|
||||||
|
|||||||
@@ -1,18 +1,14 @@
|
|||||||
package com.gxwebsoft.oa.entity;
|
package com.gxwebsoft.oa.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
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.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 任务记录表
|
* 任务记录表
|
||||||
*
|
*
|
||||||
@@ -93,6 +89,9 @@ public class Task implements Serializable {
|
|||||||
@ApiModelProperty(value = "最后回复人")
|
@ApiModelProperty(value = "最后回复人")
|
||||||
private Integer lastReadUser;
|
private Integer lastReadUser;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "最后回复人的头像")
|
||||||
|
private String lastAvatar;
|
||||||
|
|
||||||
@ApiModelProperty(value = "排序(数字越小越靠前)")
|
@ApiModelProperty(value = "排序(数字越小越靠前)")
|
||||||
private Integer sortNumber;
|
private Integer sortNumber;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user