Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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<GanttOrderModel> children = new ArrayList<>();
+    private List<GanttLineModel> lineModels = new ArrayList<>();
 }

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<SalesOrder> salesOrders = new ArrayList<>();
+}