“修改项g修改甘特图pojo

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;//完成百分比
 }

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;

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<GanttOrderModel> children = new ArrayList<>();
 }