diff --git a/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java index 13462c55..a9cd8c5e 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java @@ -728,10 +728,26 @@ public class TabOrderMonitorService return s == null ? "" : s; } - /** 已排序主键的内存分页切片,并按切片顺序回查明细(VO)。 */ + /** 已排序主键的内存分页切片,并按切片顺序回查明细(VO)。 + * 列表页只需展示列:走窄列 ListByIds,避免公网传输 o.* 全行宽表(同步专用)拖慢列表。 */ private List doPageByKeys(String table, List orderedKeys, int pn, int ps) { - return toVoList(doRowsByKeys(table, orderedKeys, pn, ps)); + if (orderedKeys == null || orderedKeys.isEmpty()) + { + return Collections.emptyList(); + } + int from = (pn - 1) * ps; + if (from >= orderedKeys.size()) + { + return Collections.emptyList(); + } + List slice = orderedKeys.subList(from, Math.min(from + ps, orderedKeys.size())); + List ids = new ArrayList(slice.size()); + for (MatchedOrderKey key : slice) + { + ids.add(key.getId()); + } + return loadListVosByIds(table, ids); } /** 已排序主键的内存分页切片,按切片顺序回查全行(VO + Oracle 原始行)。 */ diff --git a/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml index b75903a4..e403e0ce 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml @@ -58,10 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 1 = 1 - AND o.PICKUP_DATE >= TO_TIMESTAMP(#{query.beginTime}, 'YYYY-MM-DD HH24:MI:SS') + + AND o.PICKUP_DATE >= TO_DATE(#{query.beginTime}, 'YYYY-MM-DD HH24:MI:SS') - AND o.PICKUP_DATE <= TO_TIMESTAMP(#{query.endTime}, 'YYYY-MM-DD HH24:MI:SS') + AND o.PICKUP_DATE <= TO_DATE(#{query.endTime}, 'YYYY-MM-DD HH24:MI:SS') AND o.BL_PICKUP = 1 AND o.ORDER_STATUS IN (3, 4, 5, 6, 7, 8, 11) @@ -135,11 +138,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"