|
@@ -977,6 +977,19 @@
|
|
|
WHERE SU.USER_ID=#{userId}
|
|
|
</select>
|
|
|
|
|
|
+
|
|
|
+ <select id="getReceiveAddressId" resultType="java.util.LinkedHashMap">
|
|
|
+ SELECT DISTINCT RRA.ADDRESS_PROVINCE ||
|
|
|
+ RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
|
|
|
+ RRP.ADDRESS_DELIVERY_ADDRESS "address"
|
|
|
+ FROM RMS_RECEIVE_PLACE RRP
|
|
|
+ LEFT JOIN RMS_RECEIVE_ADDRESS RRA
|
|
|
+ ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
|
|
|
+ WHERE RRA.ADDRESS_PROVINCE ||
|
|
|
+ RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
|
|
|
+ RRP.ADDRESS_DELIVERY_ADDRESS like #{con}
|
|
|
+ </select>
|
|
|
+
|
|
|
|
|
|
<select id="getCarrierListByPrice" resultType="java.util.LinkedHashMap">
|
|
|
select p0.*,(SELECT COUNT(*) "total" FROM RMS_CARRIER RC) "total" from (select RC.CARRIER_NAME "carrierName",RC.CARRIER_ID "carrierId",ROWNUM r
|
|
@@ -1092,7 +1105,7 @@
|
|
|
|
|
|
<update id="updatePriceValueNew">
|
|
|
UPDATE AMS_CONTRACT_TRANSPORT_PRICE ACTP
|
|
|
- SET ACTP.PRICE_VALUE=#{priceValue},ACTP.HAUL_DISTANCE=#{haulDistance}
|
|
|
+ SET ACTP.PRICE_VALUE=#{priceValue}
|
|
|
where ACTP.PRICE_ID IN(
|
|
|
select
|
|
|
DISTINCT
|
|
@@ -1229,30 +1242,6 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getAddressDeliveryAddressForDetails" resultType="java.util.LinkedHashMap">
|
|
|
-
|
|
|
- FROM (SELECT
|
|
|
- distinct
|
|
|
- RRA.ADDRESS_ID "addressId",
|
|
|
- RRA.ADDRESS_PROVINCE "province",
|
|
|
- RRA.ADDRESS_DISTRICT "district",
|
|
|
- RRA.ADDRESS_TOWN "town",
|
|
|
- RRP.ADDRESS_DELIVERY_ADDRESS "address1",
|
|
|
- RRA.ADDRESS_PROVINCE ||RRA.ADDRESS_DISTRICT|| RRA.ADDRESS_TOWN||RRP.ADDRESS_DELIVERY_ADDRESS "address",
|
|
|
- RRP.PLACE_ID "placeId",
|
|
|
- TO_CHAR(ACTP.PRICE_VALUE, '9999999990.99') "pricevalue",
|
|
|
- ACTP.PRICE_ID "priceid"
|
|
|
- FROM RMS_RECEIVE_ADDRESS RRA
|
|
|
- LEFT JOIN RMS_RECEIVE_PLACE RRP
|
|
|
- ON RRP.ADDRESS_ID=RRA.ADDRESS_ID
|
|
|
- LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
|
|
|
- ON ACTP.PLACE_ID=RRP.PLACE_ID
|
|
|
- WHERE ACTP.DELETED = 0
|
|
|
- and ACTP.ISSTANDARD IS NULL
|
|
|
- ) RRRA
|
|
|
- <if test="con != null" >
|
|
|
- WHERE RRRA."address" LIKE #{con}
|
|
|
- </if>
|
|
|
- order by RRRA."pricevalue" asc nulls last-->
|
|
|
select * from(
|
|
|
select a_t_price.PRICE_ID "priceid",
|
|
|
r_r_address.ADDRESS_PROVINCE "addressProvince",
|
|
@@ -1287,10 +1276,11 @@
|
|
|
on rs.SHIPPER_ID = a_t_price.SHIPPER_ID
|
|
|
<where>
|
|
|
TYPE=1
|
|
|
- and a_t_price.ISSTANDARD is null
|
|
|
- and a_t_price.DELETED = 0
|
|
|
+ --and a_t_price.ISSTANDARD is null
|
|
|
+ --and a_t_price.DELETED = 0
|
|
|
<if test="carrierName1!=null and carrierName1 != ''.toString() ">
|
|
|
- and r_carrier.CARRIER_NAME like CONCAT('%',CONCAT(#{carrierName1},'%'))
|
|
|
+ and (r_carrier.CARRIER_NAME like CONCAT('%',CONCAT(#{carrierName1},'%'))
|
|
|
+ or r_carrier.CARRIER_NAME is null)
|
|
|
</if>
|
|
|
<if test="con !=null and con != ''.toString()">
|
|
|
and
|
|
@@ -1299,6 +1289,7 @@
|
|
|
like CONCAT('%',CONCAT(#{con},'%'))
|
|
|
</if>
|
|
|
</where>
|
|
|
+ order by a_t_price.INSERT_TIME desc
|
|
|
)
|
|
|
</select>
|
|
|
|