From 7a077fae5da5ea858f178c32350655cf19d5010f Mon Sep 17 00:00:00 2001
From: chenxinying <1039655633@qq.com>
Date: Fri, 22 Mar 2024 15:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E4=B8=89=E6=A3=80=E6=89=BF?=
 =?UTF-8?q?=E8=BF=90=E5=9C=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrafficSecurityWaybillRegistrationMapper.xml     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
index 164dde7..3adef60 100644
--- a/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
+++ b/src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
@@ -207,20 +207,28 @@
     <select id="findById" resultType="com.zcloud.entity.PageData" parameterType="pd">
         select
         <include refid="Field"></include>,
-        s.NAME as USERNAME,
+        s.NAME,
         s.PHONE,
         t.OPERATTIME as STARTTIME,
         p.OPERATTIME as STOPTIME,
         c.PLATE_NUMBER,
         c.APPROVED_TOTAL_MASS,
         c.APPROVED_LOAD_CAPACITY,
-        c.VIN
+        c.VIN,
+        b.LOCATIONNAME AS ORIGIN_NAME,
+        b2.LOCATIONNAME AS DESTINATION_NAME,
+        m.CUSTOMERNAME AS CLIENT_NAME,
+        c2.CUSTOMERNAME AS CONFIRMER_NAME
         from
         <include refid="tableName"></include> f
          left join sys_user s on s.USER_ID = f.PRACTITIONER
          left join bus_traffic_driving_sign t on t.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and t.CHECKTYPE_ID = 'status001'
         left join bus_traffic_driving_sign p on p.WAYBILLREGISTRATION_ID = f.WAYBILLREGISTRATION_ID and p.CHECKTYPE_ID = 'status003'
         left join bus_traffic_mechanical_freighttrailer c on c.FREIGHTTRAILER_ID = f.TRUCKCART
+        left join bus_traffic_location_management b on f.ORIGIN = b.LOCATIONNAME_ID
+        left join bus_traffic_location_management b2 on f.DESTINATION = b2.LOCATIONNAME_ID
+        left join bus_traffic_customer_management m on f.CLIENT = m.CUSTOMERNAME_ID
+        left join bus_traffic_customer_management c2 on f.CONFIRMER = c2.CUSTOMERNAME_ID
         where
         f.WAYBILLREGISTRATION_ID = #{WAYBILLREGISTRATION_ID}
     </select>