From e83ea0388dc147c7dc79856f0e3918e322d00e56 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 14 Sep 2024 19:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=91=E8=B4=A7=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderOriginMapper.xml    | 348 +++++++++++++++---
 1 file changed, 306 insertions(+), 42 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
index 0f8af88ca..11225843c 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
@@ -1,8 +1,7 @@
 <?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.IoCollectOrderOriginMapper">
-
- <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
+    <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
             resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
         SELECT ico.billNo,
                ico.busType,
@@ -23,103 +22,368 @@
                ico.splitMsg,
                ico.fromCorpName,
                ico.tagMsg,
-               sys_workplace_document.busName                       busTypeName,
-               thr_bustype_origin.name                      actionName,
+               sys_workplace_document.busName                               busTypeName,
+               thr_bustype_origin.name                                      actionName,
                sw.workplaceName,
                ico.id,
                ico.orderTime,
                ico.uploadStatus,
                ico.uploadError,
                ico.errorMsg,
-               row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence
+               ico.shipper,
+               ico.shipperName,
+               row_number()
+                       over ( order by case
+                                           when ico.orderTime is null then ico.createTime
+                                           else ico.orderTime end desc ) as orderSequence
         FROM io_collect_order_origin ico
                  left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
                  left join thr_bustype_origin on sys_workplace_document.documentTypeCode = thr_bustype_origin.action
                  left join basic_corp bc on ico.fromCorp = bc.erpId
                  left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId
+
         <where>
             <if test="billNo != '' and billNo != null">
-                AND billNo LIKE concat('%', #{billNo}, '%')
+                AND billNo LIKE concat('%',
+                                       #{billNo}
+                ,
+                                       '%'
+                )
             </if>
             <if test="workplaceName != '' and workplaceName != null">
-                AND workplaceName LIKE concat('%', #{workplaceName}, '%')
+                AND workplaceName
+                    LIKE
+                    concat
+                        (
+                            '%'
+                        ,
+                            #{workplaceName}
+                        ,
+                            '%'
+                        )
             </if>
             <if test="busType != null and busType != ''">
-                AND busType = #{busType}
+                AND busType
+                    =
+                    #{busType}
             </if>
             <if test="fromCorp != '' and fromCorp != null">
-                AND ( fromCorp LIKE concat('%', #{fromCorp}, '%') or fromCorpName LIKE concat('%', #{fromCorp}, '%') )
+                AND (
+                            fromCorp
+                            LIKE
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{fromCorp}
+                                ,
+                                    '%'
+                                )
+                        or
+                            fromCorpName
+                                LIKE
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{fromCorp}
+                                ,
+                                    '%'
+                                )
+                    )
             </if>
             <if test="fromType != '' and fromType != null">
-                AND fromType LIKE concat('%', #{fromType}, '%')
-            </if>
-            <if test="collectCode != null and collectCode != ''">
-                AND collectCode = #{collectCode}
+                AND fromType
+                    LIKE
+                    concat
+                        (
+                            '%'
+                        ,
+                            #{fromType}
+                        ,
+                            '%'
+                        )
             </if>
             <if test="busType != null and busType != ''">
-                AND busType = #{busType}
+                AND busType
+                    =
+                    #{busType}
             </if>
             <if test="tagStatus != null">
-                AND tagStatus = #{tagStatus}
+                AND tagStatus
+                    =
+                    #{tagStatus}
             </if>
             <if test="workPlaceCode != null">
-                AND ico.workPlaceCode = #{workPlaceCode}
+                AND ico
+                        .
+                        workPlaceCode
+                    =
+                    #{workPlaceCode}
             </if>
             <if test="chargeUser != null">
-                AND sw.chargeUser = #{chargeUser}
+                AND sw
+                        .
+                        chargeUser
+                    =
+                    #{chargeUser}
             </if>
             <if test="unionKey != null">
                 AND (
-                        ico.billNo like concat('%', #{unionKey}, '%')
-                        or ico.fromCorp like concat('%', #{unionKey}, '%')
-                        or ico.fromType like concat('%', #{unionKey}, '%')
-                        or ico.fromCorpName like concat('%', #{unionKey}, '%')
-                        or ico.backupOrderRemark1 like concat('%', #{unionKey}, '%')
-                        or ico.backupOrderRemark2 like concat('%', #{unionKey}, '%')
-                        or ico.backupOrderRemark3 like concat('%', #{unionKey}, '%')
-                        or ico.backupOrderRemark4 like concat('%', #{unionKey}, '%')
-                        or ico.backupOrderRemark5 like concat('%', #{unionKey}, '%')
-                        or ico.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
+                            ico
+                                .
+                                billNo
+                            like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                fromCorp
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                fromType
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                fromCorpName
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                backupOrderRemark1
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                backupOrderRemark2
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                backupOrderRemark3
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                backupOrderRemark4
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                backupOrderRemark5
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                backupOrderRemark6
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{unionKey}
+                                ,
+                                    '%'
+                                )
+                    )
             </if>
             <if test="tagStatusList != null and tagStatusList.size() > 0">
-                and tagStatus in
+                and
+                    tagStatus
+                    in
                 <foreach collection="tagStatusList" item="item" index="index" separator="," open="(" close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="workPlaceCodes != null and workPlaceCodes.size() > 0">
-                and ico.workPlaceCode in
+                and
+                    ico
+                        .
+                        workPlaceCode
+                    in
                 <foreach collection="workPlaceCodes" item="item" index="index" separator="," open="(" close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="invAlert != null">
-                and ico.invAlert =#{invAlert}
+                and ico
+                        .
+                        invAlert
+                    =
+                    #{invAlert}
             </if>
             <if test="invAlerts != null and invAlerts.size() > 0">
-                and ico.invAlert in
+                and
+                    ico
+                        .
+                        invAlert
+                    in
                 <foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="uploadStatus != null">
-                and ico.uploadStatus = #{uploadStatus}
+                and ico
+                        .
+                        uploadStatus
+                    =
+                    #{uploadStatus}
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+                AND date_format
+                    (
+                        ico
+                            .
+                            billTime
+                    ,
+                        '%Y-%m-%d'
+                    )
+                    between
+                    date_format
+                        (
+                            #{startTime}
+                        ,
+                            '%Y-%m-%d'
+                        )
+                    and
+                    date_format
+                        (
+                            #{endTime}
+                        ,
+                            '%Y-%m-%d'
+                        )
             </if>
             <if test="keywords != null and keywords != ''">
-                and (ico.billNo like concat('%', #{keywords}, '%')
-                    or ico.fromCorp like concat('%', #{keywords}, '%')
-                    or ico.fromCorpName like concat('%', #{keywords}, '%')
-                    or ico.fromType like concat('%', #{keywords}, '%'))
+                and (
+                            ico
+                                .
+                                billNo
+                            like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{keywords}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                fromCorp
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{keywords}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                fromCorpName
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{keywords}
+                                ,
+                                    '%'
+                                )
+                        or
+                            ico
+                                .
+                                fromType
+                                like
+                            concat
+                                (
+                                    '%'
+                                ,
+                                    #{keywords}
+                                ,
+                                    '%'
+                                )
+                    )
             </if>
         </where>
-        GROUP BY
-        ico.billNo
+        GROUP BY ico.billNo
         order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc
     </select>
-
-
-
 </mapper>