Merge remote-tracking branch 'origin/dev' into dev

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>