From b214cf908c066149c61266968619e5108870fee7 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Mon, 1 Aug 2022 21:30:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=97=A5=E5=BF=97=E6=A0=B9=E6=8D=AE=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/business/StockOrderUploadLogController.java  | 6 +++++-
 .../api/admin/req/business/StockOrderUploadLogRequest.java  | 2 ++
 .../mybatis/mapper/business/StockOrderUploadLogDao.xml      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadLogController.java
index f9b7e09c..a49ea560 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadLogController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderUploadLogController.java
@@ -8,6 +8,7 @@ import com.glxp.api.admin.service.business.StockOrderUploadLogService;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -30,7 +31,10 @@ public class StockOrderUploadLogController {
      * @return
      */
     @GetMapping("/udiwms/stock/order/uploadLog/filter")
-    public BaseResponse filter(StockOrderUploadLogRequest request) {
+    public BaseResponse filter(StockOrderUploadLogRequest request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
         List<StockOrderUploadLogEntity> list = stockOrderUploadLogService.filter(request);
         PageInfo<StockOrderUploadLogEntity> pageInfo = new PageInfo<>(list);
         PageSimpleResponse pageSimpleResponse = new PageSimpleResponse();
diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadLogRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadLogRequest.java
index e866ced2..b451ca7b 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadLogRequest.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderUploadLogRequest.java
@@ -2,6 +2,7 @@ package com.glxp.api.admin.req.business;
 
 import com.glxp.api.admin.req.ListPageRequest;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -24,6 +25,7 @@ public class StockOrderUploadLogRequest extends ListPageRequest {
     /**
      * 提交时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date submitTime;
 
     /**
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml
index 64d9f8ab..8defeb97 100644
--- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml
@@ -162,7 +162,7 @@
                 AND status = #{status}
             </if>
             <if test="submitTime != null">
-                AND submitTime = date_format(#{submitTime},'%Y-%m-%d')
+                AND date_format(submitTime, '%Y-%m-%d') = date_format(#{submitTime},'%Y-%m-%d')
             </if>
             <if test="fromType != null">
                 AND fromType = #{fromType}