FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-06 07:21:24 +08:00
Code Packages Releases Activity

temp 2023/5/2

Browse Source
This commit is contained in:
GGB
2023-05-02 00:59:56 +08:00
parent 0a67905525
commit 9b33b1061d
14 changed files with 365 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserWork.java
View File

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.Version;
import java.io.Serial;
import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -35,12 +37,14 @@ public class UserWork implements Serializable {
* 用户
*/
@TableField("user_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 工作事项
*/
@TableField("work_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long workId;
/**

14
Pinnacle/src/main/java/com/cfive/pinnacle/entity/Work.java
View File

@@ -9,7 +9,11 @@ import com.baomidou.mybatisplus.annotation.Version;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -30,6 +34,7 @@ public class Work implements Serializable {
private static final long serialVersionUID = 1L;
@TableId("id")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -44,6 +49,9 @@ public class Work implements Serializable {
@TableField("publisher_id")
private Long publisherId;
@TableField(exist = false)
private String publisherName;
/**
* 创建时间
*/
@@ -81,4 +89,10 @@ public class Work implements Serializable {
@TableField("version")
@Version
private Integer version;
@TableField(exist = false)
private List<UserWork> userWorkList;
@TableField(exist = false)
private List<User> worker;
@TableField(exist = false)
private double progress;
}