From d4f963ee70eb10d7e3f1119ac170c35711f10e73 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Tue, 26 Nov 2019 18:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java    | 12 +++++++++---
 .../estsh/i3plus/pojo/aps/model/StatisticReportReponse.java | 13 +++++++++++++
 .../cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java     |  1 -
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java
index aa9b938..7116296 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java
@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.pojo.aps.model;
 
-import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.Api;
 import lombok.Data;
 
@@ -16,9 +19,12 @@ import java.util.Date;
  **/
 @Data
 @Api("报表分页查询参数")
-public class ReportPager extends Pager {
-    private String filter;  // 物料筛选条件
+public class ReportPager extends APSPager {
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date begin;     // 统计开始时间
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date end;       // 统计结束时间
     private ApsEnumUtil.MATERIAL_REPORT_TYPE type;
     private ApsEnumUtil.REPORT_TIME_SPAN span;  // 统计时间间隔
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java
new file mode 100644
index 0000000..91a36ab
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class StatisticReportReponse {
+    private List<String> headers = new ArrayList<>();
+    private List<Map<String, String>> datas = new ArrayList<>();
+}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index 1f6c237..f1c1054 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -84,7 +84,6 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MATERIAL_REPORT_TYPE {
-        PRODUCE("PRODUCE", "生产"),
         PURCHASE("PURCHASE", "采购"),
         INVENTORY("INVENTORY", "库存");