提交代码

src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -765,7 +765,7 @@
     r_r_address.ADDRESS_PROVINCE "addressProvince",
     r_r_address.ADDRESS_DISTRICT "addressDistrict",
     r_r_address.ADDRESS_TOWN "addressTown",
-    rrp.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+    r_r_place.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
     case
         when (SELECT COUNT(P."carrierName") FROM(select DISTINCT RC.CARRIER_NAME "carrierName"
     from RMS_RECEIVE_PLACE RRP
@@ -778,7 +778,7 @@
     WHERE RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
     RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS =
     r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT ||
-    r_r_address.ADDRESS_TOWN || rrp.ADDRESS_DELIVERY_ADDRESS
+    r_r_address.ADDRESS_TOWN || r_r_place.ADDRESS_DELIVERY_ADDRESS
     AND ACTP.PRICE_ID IS NOT NULL
     AND ACTP.DELETED = 0
     AND ACTP.TYPE = 1
@@ -794,7 +794,7 @@
     WHERE RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
     RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS =
     r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT ||
-    r_r_address.ADDRESS_TOWN || rrp.ADDRESS_DELIVERY_ADDRESS
+    r_r_address.ADDRESS_TOWN || r_r_place.ADDRESS_DELIVERY_ADDRESS
     AND ACTP.PRICE_ID IS NOT NULL
     AND ACTP.DELETED = 0
     AND ACTP.TYPE = 1
@@ -813,12 +813,12 @@
     rs.SHIPPER_NAME "shipperName",
     a_t_price.OILPRICE_CHANGE_THRESHOLD "oilpriceChangeThreshold",
     a_t_price.haul_distance "haulDistance",
-    rrp.place_id "placeId"
+    r_r_place.place_id "placeId"
     from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
-    left join RMS_RECEIVE_PLACE rrp
-    on a_t_price.PLACE_ID=rrp.PLACE_ID
+    left join RMS_RECEIVE_PLACE r_r_place
+    on a_t_price.PLACE_ID=r_r_place.PLACE_ID
     left join RMS_RECEIVE_ADDRESS r_r_address
-    on rrp.ADDRESS_ID = r_r_address.ADDRESS_ID
+    on r_r_place.ADDRESS_ID = r_r_address.ADDRESS_ID
     left join RMS_CAPACITY_TYPE r_c_type
     on a_t_price.CAPACITY_TYPE_ID=r_c_type.CAPACITY_TYPE_ID
     left join RMS_CARRIER r_carrier
@@ -838,7 +838,7 @@
         <if test="con !=null and con != ''.toString()">
           and
           r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT  || r_r_address.ADDRESS_TOWN
-          || rrp.ADDRESS_DELIVERY_ADDRESS ||  r_carrier.CARRIER_NAME || r_c_type.CAPACITY_TYPE_NAME
+          || r_r_place.ADDRESS_DELIVERY_ADDRESS ||  r_carrier.CARRIER_NAME || r_c_type.CAPACITY_TYPE_NAME
           like CONCAT('%',CONCAT(#{con},'%'))
         </if>
     </where>