wlzboy
3 天以前 40a8157440e3b906da8f52e07d939d78c3f4c313
ruoyi-system/src/main/resources/mapper/system/LegacyTransferSyncMapper.xml
@@ -46,6 +46,8 @@
        <result property="DispatchOrdState" column="DispatchOrdState" />
        <result property="DispatchOrdNo" column="DispatchOrdNo" />
        <result property="DispatchOrdClass" column="DispatchOrdClass" />
        <result property="ServiceOrdVIP" column="ServiceOrdVIP" />
        <result property="FromHQ_is" column="FromHQ_is" />
        <result property="DispatchOrd_NS_Time" column="DispatchOrd_NS_Time" />
    </resultMap>
@@ -57,12 +59,14 @@
        <result property="EntourageState" column="EntourageState" />
    </resultMap>
    
    <!-- 查询指定日期范围的转运单数据 -->
    <!-- 查询指定日期范围的转运单数据(Keyset游标分页,走主键索引,彻底规避超时) -->
    <select id="selectTransferOrders" resultMap="TransferOrderResult">
        SELECT
        SELECT TOP (${pageSize})
            a.ServiceOrdID,
            a.Old_ServiceOrdID_TXT,
            a.ServiceOrdNo,
            a.FromHQ_is,
            a.ServiceOrdVIP,
            a.ServiceOrdTraVia,
            a.ServiceOrdApptDate,
            a.ServiceOrd_NS_ID,
@@ -98,15 +102,21 @@
            a.ServiceOrdPtServices,
            a.ServiceOrdPtInServices,
            a.ServiceOrdPtName,
            b.DispatchOrdState,
            b.DispatchOrdNo,
            b.DispatchOrdClass,
            a.ServiceOrdClass
        FROM ServiceOrder as a
        left JOIN DispatchOrd b on a.ServiceOrdID = b.ServiceOrdIDDt
            b.DispatchOrdClass
        FROM ServiceOrder AS a
        OUTER APPLY (
            SELECT TOP 1
            DispatchOrd_NS_Time, DispatchOrdTraStreet, DispatchOrdStartDate,
            DispatchOrdActualDate, DispatchOrdReturnDate, DispatchOrdTraEnd,
            DispatchOrdState, DispatchOrdID, DispatchOrdCarID, DispatchOrdNo, DispatchOrdClass
            FROM DispatchOrd b
            WHERE b.ServiceOrdIDDt = a.ServiceOrdID
        ) b
        WHERE a.ServiceOrdState &lt;= 3
            AND a.ServiceOrd_CC_Time > #{startDate}
            AND a.ServiceOrd_CC_Time between #{startDate} and #{endDate}
            AND a.ServiceOrdID > #{lastId}
        ORDER BY a.ServiceOrdID
    </select>
    
    <!-- 根据服务单ID和调度单ID查询转运单数据 -->
@@ -115,6 +125,8 @@
            a.ServiceOrdID,
            a.Old_ServiceOrdID_TXT,
            a.ServiceOrdTraVia,
            a.FromHQ_is,
            a.ServiceOrdVIP,
            a.ServiceOrdNo,
            a.ServiceOrdApptDate,
            a.ServiceOrdUserID,
@@ -165,6 +177,8 @@
        SELECT
        a.ServiceOrdID,
        a.Old_ServiceOrdID_TXT,
        a.FromHQ_is,
        a.ServiceOrdVIP,
        a.ServiceOrdTraVia,
        a.ServiceOrdNo,
        a.ServiceOrdApptDate,