From cc6ab7dc42c9582440faf04c577193f84c96de31 Mon Sep 17 00:00:00 2001 From: gsz Date: Sat, 7 Aug 2021 14:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E4=BF=AE=E6=94=B9=E9=A1=B9g=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=94=98=E7=89=B9=E5=9B=BEpojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttCalendarModel.java | 4 +++- .../i3plus/pojo/aps/model/GanttEventRequest.java | 2 +- .../estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 13abdc2..7a80b06 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -10,7 +10,7 @@ import java.util.Date; @Data public class GanttCalendarModel { - private Long resourceId; + private String resourceId; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date startDate; @@ -21,4 +21,6 @@ public class GanttCalendarModel { //private String timeRangeColor; private String eventColor; private String name; + + private Double percentDone;//完成百分比 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java index 69d1e23..706f7bc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java @@ -21,7 +21,7 @@ import java.util.List; @Data @Api("甘特图分页查询参数") public class GanttEventRequest { - private Long[] resourceIds; + private String[] resourceIds; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date begin; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java index 88cd06c..ce36f12 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -1,14 +1,31 @@ package cn.estsh.i3plus.pojo.aps.model; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Data public class GanttOrderModel { - private Long id; + private String id; private String code; private String name; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date startDate; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date endDate; + private String color;//颜色 + private Double percentDone;//完成百分比 + private Boolean expanded;//是否展开树 + private Boolean rollup;//自动把数据相加 在children的上层 当前 + private long duration;//期间 -- + private String unit;//期间单位 -- private List children = new ArrayList<>(); }