From 4047e7396e7b672242614f225e5e1cff4e69c234 Mon Sep 17 00:00:00 2001
From: hy2250089 <hy2250089@qq.com>
Date: Mon, 23 Dec 2019 18:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=94=9F=E4=BA=A7=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E6=97=A5=E6=9C=9F=E5=8F=98=E9=87=8F=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/produce/manage/mapper/ProductProcessMapper.xml     | 2 +-
 .../wms/produce/manage/model/ProductProcessParams.java     | 7 +++----
 .../wms/produce/manage/web/ProductProcessController.java   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml
index ce20904..69c7840 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml
@@ -109,7 +109,7 @@
                 OR  client.client_name LIKE CONCAT('%', #{keywords}, '%')
                 OR  prodproc.contract_name LIKE CONCAT('%', #{keywords}, '%')
             </if>
-            <if test="createDate != null">
+            <if test="createDate != null and createDate != ''">
                 AND DATE_FORMAT(prodproc.create_time,'%Y-%m-%d') = DATE_FORMAT(#{createDate}, '%Y-%m-%d')
             </if>
             <if test="companyId != null">
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java
index 7d00eca..4fa77c2 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java
@@ -11,8 +11,7 @@ import java.util.Date;
 public class ProductProcessParams extends QueryParams {
     private Integer productProcessId;
 
-    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
-    private Date createDate;
+    private String createDate;
 
     public Integer getProductProcessId() {
         return productProcessId;
@@ -22,11 +21,11 @@ public class ProductProcessParams extends QueryParams {
         this.productProcessId = productProcessId;
     }
 
-    public Date getCreateDate() {
+    public String getCreateDate() {
         return createDate;
     }
 
-    public void setCreateDate(Date createDate) {
+    public void setCreateDate(String createDate) {
         this.createDate = createDate;
     }
 }
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
index 5f3df4a..a674c09 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
@@ -91,7 +91,7 @@ public class ProductProcessController {
      */
     @ApiOperation(value = "批次生产加工单分页查询", notes = "批次生产加工单分页查询")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "createDate", value = "创建时间", paramType = "query", dataType = "Date", required = false),
+            @ApiImplicitParam(name = "createDate", value = "创建时间", paramType = "query", dataType = "String", required = false),
             @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String", required = false),
             @ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false)