diff --git a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java b/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java index e177614..6dcd3fa 100644 --- a/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java +++ b/src/main/java/com/jsl/oa/model/doData/ProjectWorkDO.java @@ -1,16 +1,28 @@ + package com.jsl.oa.model.doData; -/* - 张睿相 Java -*/ -/** - * 总体描述 - *
创建时间:2024/3/11 21:54
- * - * @author 张睿相 - * @since v1.0 - */ +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.sql.Timestamp; + +@Data +@Accessors(chain = true) +@JsonInclude(JsonInclude.Include.NON_NULL) public class ProjectWorkDO { -} - - + private Long id; + private Long pid; + private Long projectId; + private Long principalId; + private Integer cycle; + private Integer workLoad; + private Integer type; + private String name; + private String description; + private Integer isDelete; + private Integer isFinish; + private boolean status; + private Timestamp beginTime; + private Timestamp completeTime; +} \ No newline at end of file diff --git a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java index c61f718..18eac73 100644 --- a/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java +++ b/src/main/java/com/jsl/oa/model/voData/ProjectWorkVO.java @@ -1,16 +1,31 @@ package com.jsl.oa.model.voData; -/* - 张睿相 Java -*/ -/** - * 总体描述 - *创建时间:2024/3/11 21:54
- * - * @author 张睿相 - * @since v1.0 - */ +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.sql.Timestamp; + +@Data public class ProjectWorkVO { + + private Long pid; + @NotNull(message = "项目id不能为空") + private Long projectId; + @NotNull(message = "负责人id不能为空") + private Long principalId; + @NotNull(message = "周期不能为空") + private Integer cycle; + + private Integer workLoad; + @NotNull(message = "类型不能为空") + private Integer type; + @NotNull(message = "名字不能为空") + private String name; + private String description; + private Integer isDelete; + private Integer isFinish; + private Integer status; + private Timestamp beginTime; + private Timestamp completeTime; } -