适配平板修改

src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java

@@ -40,8 +40,8 @@ public class IoCollectOrderBackupController extends BaseController {
     private BasicCollectUserService basicCollectUserService;
 
 
-    @GetMapping("/udiwms/basic/collect/orderFinish/filter")
-    public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
+    @PostMapping("/udiwms/basic/collect/orderFinish/filter")
+    public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
         List<UserWorkResponse> page;

src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java

@@ -15,14 +15,9 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.collect.CollectOrderCodeManResponse;
 import com.glxp.api.res.inout.VailCodeResultResponse;
 import com.glxp.api.res.inout.VailTagResultResponse;
-import com.glxp.api.service.auth.SysWorkplaceService;
-import com.glxp.api.service.basic.UdiRelevanceService;
-import com.glxp.api.service.collect.IoCollectOrderBizService;
 import com.glxp.api.service.collect.IoCollectOrderCodeManService;
 import com.glxp.api.service.collect.IoCollectOrderService;
-import com.glxp.api.util.GennerOrderUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.json.JSONException;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -13,7 +13,7 @@ import java.util.List;
 public class CollectOrderRequest extends ListPageRequest {
 
 
-    private Integer id;
+    private Long id;
 
     /**
      * 单据号
@@ -150,5 +150,4 @@ public class CollectOrderRequest extends ListPageRequest {
     private String shipperName;
 
 
-
 }

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20

src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderBackupMapper">
-
     <select id="filterList" resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
         SELECT icob.billNo,
                icob.busType,
@@ -32,7 +31,9 @@
                icob.uploadStatus,
                icob.uploadError,
                icob.errorMsg,
-        row_number() over ( order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc )
+               row_number() over ( order by case
+                                                when icob.orderTime is null then icob.createTime
+                                                else icob.orderTime end desc )
                    as                         orderSequence
         FROM io_collect_order_backup icob
                  left join sys_workplace_document on icob.busType = sys_workplace_document.documentTypeCode
@@ -51,9 +52,6 @@
             <if test="fromCorp != '' and fromCorp != null">
                 AND fromCorp LIKE concat('%', #{fromCorp}, '%')
             </if>
-            <if test="collectCode != null and collectCode != ''">
-                AND collectCode = #{collectCode}
-            </if>
             <if test="busType != null and busType != ''">
                 AND busType = #{busType}
             </if>
@@ -120,19 +118,18 @@
             <if test="fromCorpName != '' and fromCorpName != null">
                 AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
             </if>
-        <if test="startTime != null">
+            <if test="startTime != null  and startTime != ''">
                 <![CDATA[
                 and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
                 ]]>
             </if>
-        <if test="endTime != null">
+            <if test="endTime != null and endTime != ''">
                 <![CDATA[
                 and icob.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
                 ]]>
             </if>
         </where>
-        GROUP BY
-        icob.billNo
+        GROUP BY icob.billNo
         order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc
     </select>
 </mapper>