1.修复单据上传日志根据上传时间查询无效问题

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();

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;
 
     /**

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}