From 84639dac5884f339ea77f6c0e755ebf8bb0f1d01 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sun, 6 Oct 2024 20:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=B9=B3=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IoCollectOrderBackupController.java       |   4 +-
 .../IoCollectOrderCodeManController.java      |   5 -
 .../api/req/collect/CollectOrderRequest.java  |   3 +-
 src/main/resources/application-dev.yml        |   4 +-
 .../collect/IoCollectOrderBackupMapper.xml    | 123 +++++++++---------
 5 files changed, 65 insertions(+), 74 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
index 13b37ba8c..db16b9bd9 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java
+++ b/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;
diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
index ff1c1cb6d..c0455e8c5 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java
+++ b/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;
diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
index a6f4f3380..693c4f5d6 100644
--- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java
+++ b/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;
 
 
-
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 815fbe996..3fa38cd6c 100644
--- a/src/main/resources/application-dev.yml
+++ b/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
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
index 49323c2ac..4a92ed882 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBackupMapper.xml
@@ -1,43 +1,44 @@
 <?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,
-        icob.fromType,
-        icob.fromTypeDesc,
-        icob.fromCorp,
-        icob.billTime,
-        icob.orderCirType,
-        icob.createTime,
-        icob.workPlaceCode,
-        icob.remark,
-        icob.createUser,
-        icob.updateTime,
-        icob.updateUser,
-        icob.tagStatus,
-        icob.splitStatus,
-        icob.invAlert,
-        icob.splitMsg,
-        icob.fromCorpName,
-        icob.shipperName,
-        icob.thrBusType,
-        icob.shipper,
-        icob.tagMsg,
-        sys_workplace_document.busName busTypeName,
-        sw.workplaceName,
-        icob.id,
-        icob.orderTime,
-        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 )
-        as orderSequence
+               icob.busType,
+               icob.fromType,
+               icob.fromTypeDesc,
+               icob.fromCorp,
+               icob.billTime,
+               icob.orderCirType,
+               icob.createTime,
+               icob.workPlaceCode,
+               icob.remark,
+               icob.createUser,
+               icob.updateTime,
+               icob.updateUser,
+               icob.tagStatus,
+               icob.splitStatus,
+               icob.invAlert,
+               icob.splitMsg,
+               icob.fromCorpName,
+               icob.shipperName,
+               icob.thrBusType,
+               icob.shipper,
+               icob.tagMsg,
+               sys_workplace_document.busName busTypeName,
+               sw.workplaceName,
+               icob.id,
+               icob.orderTime,
+               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 )
+                   as                         orderSequence
         FROM io_collect_order_backup icob
-        left join sys_workplace_document on icob.busType = sys_workplace_document.documentTypeCode
-        left join basic_corp bc on icob.fromCorp = bc.erpId
-        left join sys_workplace sw on icob.workPlaceCode = sw.workplaceId
+                 left join sys_workplace_document on icob.busType = sys_workplace_document.documentTypeCode
+                 left join basic_corp bc on icob.fromCorp = bc.erpId
+                 left join sys_workplace sw on icob.workPlaceCode = sw.workplaceId
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo LIKE concat('%', #{billNo}, '%')
@@ -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>
@@ -68,15 +66,15 @@
             </if>
             <if test="unionKey != null">
                 AND (
-                icob.billNo like concat('%', #{unionKey}, '%')
-                or icob.fromCorp like concat('%', #{unionKey}, '%')
-                or icob.fromCorpName like concat('%', #{unionKey}, '%')
-                or icob.backupOrderRemark1 like concat('%', #{unionKey}, '%')
-                or icob.backupOrderRemark2 like concat('%', #{unionKey}, '%')
-                or icob.backupOrderRemark3 like concat('%', #{unionKey}, '%')
-                or icob.backupOrderRemark4 like concat('%', #{unionKey}, '%')
-                or icob.backupOrderRemark5 like concat('%', #{unionKey}, '%')
-                or icob.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
+                        icob.billNo like concat('%', #{unionKey}, '%')
+                        or icob.fromCorp like concat('%', #{unionKey}, '%')
+                        or icob.fromCorpName like concat('%', #{unionKey}, '%')
+                        or icob.backupOrderRemark1 like concat('%', #{unionKey}, '%')
+                        or icob.backupOrderRemark2 like concat('%', #{unionKey}, '%')
+                        or icob.backupOrderRemark3 like concat('%', #{unionKey}, '%')
+                        or icob.backupOrderRemark4 like concat('%', #{unionKey}, '%')
+                        or icob.backupOrderRemark5 like concat('%', #{unionKey}, '%')
+                        or icob.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
             </if>
 
 
@@ -93,7 +91,7 @@
                 </foreach>
             </if>
             <if test="invAlert != null">
-                and icob.invAlert =#{invAlert}
+                and icob.invAlert = #{invAlert}
             </if>
             <if test="invAlerts != null and invAlerts.size() > 0">
                 and icob.invAlert in
@@ -106,10 +104,10 @@
             </if>
             <if test="keyWords != null and keyWords != ''">
                 and (icob.billNo like concat('%', #{keyWords}, '%')
-                or icob.fromCorp like concat('%', #{keyWords}, '%')
-                or icob.workPlaceCode like concat('%', #{keyWords}, '%')
-                or icob.busType like concat('%', #{keyWords}, '%')
-                or icob.fromType like concat('%', #{keyWords}, '%'))
+                    or icob.fromCorp like concat('%', #{keyWords}, '%')
+                    or icob.workPlaceCode like concat('%', #{keyWords}, '%')
+                    or icob.busType like concat('%', #{keyWords}, '%')
+                    or icob.fromType like concat('%', #{keyWords}, '%'))
             </if>
             <if test="shipperName != '' and shipperName != null">
                 AND icob.shipperName LIKE concat('%', #{shipperName}, '%')
@@ -120,19 +118,18 @@
             <if test="fromCorpName != '' and fromCorpName != null">
                 AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
             </if>
-        <if test="startTime != null">
-            <![CDATA[
-            and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
-            ]]>
-        </if>
-        <if test="endTime != null">
-            <![CDATA[
-            and icob.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
-            ]]>
-        </if>
+            <if test="startTime != null  and startTime != ''">
+                <![CDATA[
+                and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+            <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>