From 8adc4319afe8e70b0f381f68827069e49c30c027 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 16 Apr 2026 15:36:52 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20=E8=BD=AC=E4=BB=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E8=BD=AC?=
 =?UTF-8?q?=E4=BB=B6=E5=B9=B3=E5=8F=B0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/emis/domain/EmisWaybillTransfer.java  |  6 ++--
 .../mapper/EmisWaybillTransferMapper.xml      | 31 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
index 4d3e60b47..b609f4730 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillTransfer.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisWaybillTransfer.java
  * @author linfso
  * @date 2024-05-22 01:07:48
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 运单转件表 实体类 </p>
  */
 
@@ -66,5 +66,7 @@ public class EmisWaybillTransfer extends BaseEntity
 
     //   扩展参数
     private EmisWaybill waybillDetail;
+    /* 转件平台 1:17TRACK,2:快递100 */
+    private String transferPlatform;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
index bb58ea2bc..78b4db1a1 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillTransferMapper.xml
@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="transferResean"    column="transfer_resean"    />
         <result property="transferCity"    column="transfer_city"    />
         <result property="dataFrom"    column="data_from"    />
+        <result property="transferPlatform" column="transfer_platform" />
 
     </resultMap>
 
@@ -31,7 +32,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisWaybillTransferVo">
-        select id, bill_code, transfer_bill_code, transfer_date, transfer_express, link_man, link_phone, transfer_fee, transfer_weight, transfer_volume, transfer_resean, transfer_city, data_from, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_waybill_transfer a
+        select
+        id, bill_code, transfer_bill_code, transfer_date, transfer_express, link_man, link_phone, transfer_fee,
+        transfer_weight, transfer_volume, transfer_resean, transfer_city, data_from, del_flag, create_by,
+        create_time, update_by, update_time, remark, create_site, update_site,
+        (select su.emp_name from sys_user su where su.user_id = a.create_by limit 1) as create_by_name,
+        (select es.site_name from emis_site es where es.site_code = a.create_site limit 1) as create_site_name,
+        case
+            when json_unquote(
+                json_extract(
+                    (select sc.config_value from sys_config sc where sc.config_key = 'sys.express.query.channel' limit 1),
+                    concat('$."', lower(a.transfer_express), '".chId')
+                )
+            ) = '17track' then '1'
+            else '2'
+        end as transfer_platform
+        from emis_waybill_transfer a
     </sql>
 
     <select id="selectEmisWaybillTransferList" parameterType="EmisWaybillTransfer" resultMap="EmisWaybillTransferResult">
@@ -58,6 +74,19 @@ 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="transferPlatform != null and transferPlatform != ''">
+                and (
+                    case
+                        when json_unquote(
+                            json_extract(
+                                (select sc.config_value from sys_config sc where sc.config_key = 'sys.express.query.channel' limit 1),
+                                concat('$."', lower(a.transfer_express), '".chId')
+                            )
+                        ) = '17track' then '1'
+                        else '2'
+                    end
+                ) = #{transferPlatform}
+            </if>
             <if test="createSite != null  and createSite != ''"> and create_site=#{createSite}</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site=#{updateSite}</if>