From 16162542ba495392a633775bd93764f39e59e8c5 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Fri, 25 Oct 2019 13:47:02 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9listByPage=E7=94=B1?=
 =?UTF-8?q?GET=E6=96=B9=E6=B3=95=E4=B8=BAPOST=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java    |  8 +++----
 .../cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java  | 15 +++++++++++++
 .../cn/estsh/i3plus/pojo/aps/model/APSPager.java   | 26 +++++++++++++++++++++-
 3 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
index 08be72e..95b5a20 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@@ -42,7 +42,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="PREV_SET_TIME")
     @ApiParam(value ="前设置时间")
-    private Long prevSetTime;
+    private Integer prevSetTime;
 
     @Column(name="PRODUCE_BEGIN")
     @ApiParam(value ="生产开始时间")
@@ -54,7 +54,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="生产时间")
-    private Long produceTime;
+    private Integer produceTime;
 
     @Column(name="POST_SET_BEGIN")
     @ApiParam(value ="后设置开始时间")
@@ -66,7 +66,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="POST_SET_TIME")
     @ApiParam(value ="后设置时间")
-    private Long postSetTime;
+    private Integer postSetTime;
 
     @Column(name="LOCK_BEGIN")
     @ApiParam(value ="锁定开始时间")
@@ -78,7 +78,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="LOCK_TIME")
     @ApiParam(value ="锁定时间")
-    private Long lockTime;
+    private Integer lockTime;
 
     @Column(name="WORK_ID")
     @ApiParam(value ="工作对象id")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java
new file mode 100644
index 0000000..8218c5b
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :工作计划包含的时间类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum PLAN_TYPE {
+    PREV_SET,
+    PRODUCE,
+    POST_SET,
+    LOCK
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
index 2cc398b..97f2c22 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java
@@ -3,8 +3,32 @@ package cn.estsh.i3plus.pojo.aps.model;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class APSPager extends Pager {
+    public static class SortData {
+        // 排序对象
+        private String name;
+        // 排序类型，1为升序，0为降序
+        private int orderType;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getOrderType() {
+            return orderType;
+        }
+
+        public void setOrderType(int orderType) {
+            this.orderType = orderType;
+        }
+    }
     private String filter;
-    private String sort;
+    private List<SortData> sorts;
 }