|
|
@@ -1702,19 +1702,25 @@
|
|
|
FETCH NEXT 1 ROWS ONLY
|
|
|
</select>
|
|
|
<select id="getCapacityDriverSelect" resultType="java.util.Map">
|
|
|
- SELECT
|
|
|
- DRIVER_ID "driverId",
|
|
|
- CAPACITY_ID "capacityId"
|
|
|
+ SELECT DISTINCT
|
|
|
+ OTO.TRANS_ORDER_ID "transOrderId",
|
|
|
+ OTO.DRIVER_ID "driverId",
|
|
|
+ OTO.CAPACITY_ID "capacityId",
|
|
|
+ RP.PERSONNEL_NAME "driverName",
|
|
|
+ RCA.CAPACITY_NUMBER "capacityNumber"
|
|
|
FROM
|
|
|
- OMS_TRANS_ORDER
|
|
|
- WHERE ISSUE_TIME IS NOT NULL
|
|
|
+ OMS_TRANS_ORDER OTO
|
|
|
+ LEFT JOIN RMS_PERSONNEL RP ON OTO.DRIVER_ID = RP.PERSONNEL_ID
|
|
|
+ LEFT JOIN RMS_CAPACITY RCA ON OTO.CAPACITY_ID = RCA.CAPACITY_ID
|
|
|
+ WHERE OTO.ISSUE_TIME IS NOT NULL
|
|
|
+ AND RP.PERSONNEL_NAME IS NOT NULL
|
|
|
+ AND RCA.CAPACITY_NUMBER IS NOT NULL
|
|
|
<if test="driverId!=null and driverId!=''">
|
|
|
- AND DRIVER_ID = #{driverId}
|
|
|
+ AND OTO.DRIVER_ID = #{driverId}
|
|
|
</if>
|
|
|
<if test="capacityId!=null and capacityId!=''">
|
|
|
- AND CAPACITY_ID = #{capacityId}
|
|
|
+ AND OTO.CAPACITY_ID = #{capacityId}
|
|
|
</if>
|
|
|
- ORDER BY ISSUE_TIME DESC
|
|
|
</select>
|
|
|
<select id="getCapacityInfo" resultType="java.util.Map">
|
|
|
SELECT * FROM RMS_CAPACITY
|
