From bd31fc9c9d9b9827cb61deaf98296a37330e1c91 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 14 Jun 2024 13:05:05 +0800
Subject: [PATCH] md

---
 .../emis/EmisWaybillTransferController.java   |  3 +++
 .../xdadan/erp/emis/utils/WaybillHelper.java  |  1 +
 .../mapper/EmisWaybillTransferMapper.xml      | 26 ++++++++++++++++---
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
index e234b39bc..28ff98ff1 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java
@@ -67,6 +67,9 @@ public class EmisWaybillTransferController extends EmisBaseController
     public TableDataInfo list(EmisWaybillTransfer emisWaybillTransfer)
     {
         startPage();
+
+        setPrivParams(emisWaybillTransfer);
+
         if(!StringUtils.isEmpty(emisWaybillTransfer.getBillCode())){
             emisWaybillTransfer.setBillCode(WaybillHelper.formatQueryValue(emisWaybillTransfer.getBillCode()));
             String[] billCodeSortList = emisWaybillTransfer.getBillCode().split(",");
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
index 6dd66a101..7bf787f74 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
@@ -208,6 +208,7 @@ public class WaybillHelper {
     public static String formatQueryValue(String str) {
         if(!StringUtils.isEmpty(str)){
             str=str.replaceAll("\\n", ",");
+            str=str.replaceAll(",+", ",");
             str=StringUtils.removeEnd(str, ",");
         }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
index 8c8c67cd9..aaf2a00db 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="transferBillCode != null  and transferBillCode != ''"> and transfer_bill_code like concat('%', #{transferBillCode}, '%')</if>
             <if test="transferDate != null "> and transfer_date = #{transferDate}</if>
-            <if test="transferExpress != null  and transferExpress != ''"> and transfer_express like concat('%', #{transferExpress}, '%')</if>
+            <if test="transferExpress != null  and transferExpress != ''"> and transfer_express=#{transferExpress}</if>
             <if test="linkMan != null  and linkMan != ''"> and link_man like concat('%', #{linkMan}, '%')</if>
             <if test="linkPhone != null  and linkPhone != ''"> and link_phone like concat('%', #{linkPhone}, '%')</if>
             <if test="transferFee != null "> and transfer_fee = #{transferFee}</if>
@@ -58,8 +58,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
-            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+            <if test="createSite != null  and createSite != ''"> and create_site=#{createSite}</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site=#{updateSite}</if>
+
+            <if test="params.beginTransferDate != null and params.beginTransferDate != ''">
+                and transfer_date <![CDATA[ >= ]]>  #{params.beginTransferDate}
+            </if>
+            <if test="params.endTransferDate != null and params.endTransferDate != ''">
+                and transfer_date <![CDATA[ <= ]]>  #{params.endTransferDate}
+            </if>
+
+            <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+                and (
+                    create_site in (
+                        SELECT t1.site_code FROM (
+                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                        #{params.privSiteCode} ) pd
+                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                        UNION
+                        SELECT #{params.privSiteCode} FROM dual
+                    )
+                )
+            </if>
         </where>
         order by create_time desc
     </select>