From 8b1ae09885cad64eaffee168a6744fccb1b82289 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Fri, 27 Dec 2019 14:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=94=98?=
 =?UTF-8?q?=E7=89=B9=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/aps/model/GanttEventModel.java     | 31 ++++++++++++++++
 .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ----------------------
 2 files changed, 31 insertions(+), 43 deletions(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java
 delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java
new file mode 100644
index 0000000..05bf634
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java
@@ -0,0 +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 cn.estsh.i3plus.pojo.base.common.Pager;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description : 甘特图分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
+@Data
+@Api("甘特图分页查询参数")
+public class GanttEventModel {
+    private Long[] resourceIds;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date begin;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date end;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
deleted file mode 100644
index 3da5e29..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.model;
-
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import io.swagger.annotations.Api;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description : 甘特图分页查询参数
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2019-11-22
- * @Modify:
- **/
-@Data
-@Api("甘特图分页查询参数")
-public class GanttPager extends Pager {
-    public static class SortData {
-        // 排序对象
-        private String field;
-        // 排序类型，1为升序，0为降序
-        private Boolean ascending;
-
-        public String getField() {
-            return field;
-        }
-
-        public void setField(String field) {
-            this.field = field;
-        }
-
-        public Boolean getAscending() {
-            return ascending;
-        }
-
-        public void setAscending(Boolean ascending) {
-            this.ascending = ascending;
-        }
-    }
-    private String filter;
-    private List<SortData> sorts;
-}