From 1bf2f0057e04c15dde5acc004e38c208e66c1511 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 9 Aug 2021 18:42:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8B=86=E5=88=86=E7=94=98?= =?UTF-8?q?=E7=89=B9=E5=9B=BE=E6=A0=B9=E6=8D=AE=E5=8D=95=E5=8F=B7=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttOrderModel.java | 3 ++- .../i3plus/pojo/aps/model/GanttTopOrderModel.java | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttTopOrderModel.java 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 21b06ea..dcc25d2 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 @@ -26,8 +26,9 @@ public class GanttOrderModel { private Double percentDone;//完成百分比 private Boolean expanded;//是否展开树 private Boolean rollup;//自动把数据相加 在children的上层 当前 -// private long duration; + private String duration;//持续时间 天/小时/分钟 private String durationUnit; private Boolean manuallyScheduled; private List children = new ArrayList<>(); + private List lineModels = new ArrayList<>(); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttTopOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttTopOrderModel.java new file mode 100644 index 0000000..3df04c0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttTopOrderModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.SalesOrder; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : GanttTopOrderModel + * @Author :gsz + * @Date 2021/8/9 15:39 + * @Modify + **/ +@Data +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class GanttTopOrderModel { + private String topOrder; + private List salesOrders = new ArrayList<>(); +}