From 911e93429e30e1f021b9ecbd4ab76262921f4562 Mon Sep 17 00:00:00 2001
From: jimmy <1622218722@qq.com>
Date: Fri, 23 Nov 2018 18:12:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=BD=E7=82=B9=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java | 19 +++++++++++++++++++
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java
index fa5715b..d6aad6f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import io.swagger.models.auth.In;
@@ -38,10 +39,12 @@ public class WmsIbCheckPlan extends BaseBean{
     private String partNameRdd;
 
     @Column(name="START_DATE")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value ="开始日期")
     private String startDate;
 
     @Column(name="END_DATE")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value ="结束日期")
     private String endDate;
 
@@ -57,4 +60,20 @@ public class WmsIbCheckPlan extends BaseBean{
     @ApiParam(value ="已抽点件数", example = "-1")
     private Integer checkCounter;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiParam(value="开始日期，查询开始日期")
+    public transient String startDateStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiParam(value="开始日期，查询开始日期")
+    public transient String startDateEnd;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiParam(value="结束日期，查询结束日期")
+    public transient String endDateStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiParam(value = "结束日期，查询结束日期")
+    public transient String endDateEnd;
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 3e30660..931e304 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -181,8 +181,8 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true);
+        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false);
+        HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false);
 
         getStringBuilderPack(wmsIbCheckPlan, result);