批次生产加工日期变量类型修改

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">

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;
     }
 }

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)