优化接单平台工单查询性能
This commit is contained in:
@@ -418,6 +418,8 @@ export type GrabWorkOrderResult = {
|
||||
export type ListInput = {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
/** 列表调用方已有同筛选条件的聚合总数时,可跳过独立 COUNT。 */
|
||||
includeTotal?: boolean
|
||||
/** 单状态筛选(兼容 worker 用户等其他列表) */
|
||||
status?: string
|
||||
/** 支持多个状态同时筛选(空数组表示全部状态) */
|
||||
|
||||
@@ -58,13 +58,6 @@ export const WORK_ORDER_SELECT = `
|
||||
) share_summary ON TRUE
|
||||
`
|
||||
|
||||
// Keep the page and total in one filtered query. This avoids running the same
|
||||
// joins and share aggregation twice for every list request.
|
||||
const LIST_WORK_ORDER_SELECT = WORK_ORDER_SELECT.replace(
|
||||
' SELECT\n',
|
||||
' SELECT\n COUNT(*) OVER()::int AS total_count,\n',
|
||||
)
|
||||
|
||||
type WorkerOrderOverviewRow = {
|
||||
status: string
|
||||
order_count: number
|
||||
@@ -234,6 +227,7 @@ export async function listWorkOrdersByPlatformOrderId(
|
||||
export async function listWorkOrders({
|
||||
page = 1,
|
||||
pageSize = 20,
|
||||
includeTotal = true,
|
||||
statuses = [],
|
||||
status = '',
|
||||
workOrderId = 0,
|
||||
@@ -271,10 +265,13 @@ export async function listWorkOrders({
|
||||
vipEvidencePending,
|
||||
acceptanceMode,
|
||||
giftPhase,
|
||||
useOperationalStatus,
|
||||
// 无状态筛选时运营状态不影响列表入选,不应为此聚合整张拼单表。
|
||||
useOperationalStatus:
|
||||
useOperationalStatus && (effectiveStatuses.length > 0 || vipEvidencePending),
|
||||
createdFrom,
|
||||
createdTo,
|
||||
})
|
||||
const countParams = [...params]
|
||||
const offset = (page - 1) * pageSize
|
||||
const orderBy =
|
||||
sort === 'worker_claimed_at_desc' && workerSharingId
|
||||
@@ -289,33 +286,42 @@ export async function listWorkOrders({
|
||||
: 'wo.id DESC'
|
||||
const effectiveOrderBy = pinnedFirst ? `wo.pinned_at DESC NULLS LAST, ${orderBy}` : orderBy
|
||||
params.push(pageSize, offset)
|
||||
const itemsResult = await query<WorkOrderRow>(
|
||||
`${LIST_WORK_ORDER_SELECT}
|
||||
${joins}
|
||||
${whereClause}
|
||||
ORDER BY ${effectiveOrderBy}
|
||||
LIMIT $${params.length - 1} OFFSET $${params.length}`,
|
||||
params,
|
||||
)
|
||||
// A page beyond the end has no row from which to read the window count.
|
||||
// Keep that uncommon pagination edge case correct without restoring a
|
||||
// second query for normal requests.
|
||||
let total = Number(
|
||||
(itemsResult.rows[0] as WorkOrderRow & { total_count?: number })?.total_count || 0,
|
||||
)
|
||||
if (itemsResult.rows.length === 0 && page > 1) {
|
||||
const totalResult = await query<{ total: number }>(
|
||||
`SELECT COUNT(*)::int AS total FROM work_orders wo ${joins} ${whereClause}`,
|
||||
params.slice(0, -2),
|
||||
)
|
||||
total = Number(totalResult.rows[0]?.total || 0)
|
||||
}
|
||||
// 宽详情只查当前页;不将 COUNT 窗口放进详情查询,避免 LIMIT 前处理全量 JSON。
|
||||
const [itemsResult, total] = await Promise.all([
|
||||
query<WorkOrderRow>(
|
||||
`${WORK_ORDER_SELECT}
|
||||
${joins}
|
||||
${whereClause}
|
||||
ORDER BY ${effectiveOrderBy}
|
||||
LIMIT $${params.length - 1} OFFSET $${params.length}`,
|
||||
params,
|
||||
),
|
||||
includeTotal ? countWorkOrdersWithWhere(joins, whereClause, countParams) : Promise.resolve(0),
|
||||
])
|
||||
return {
|
||||
items: itemsResult.rows,
|
||||
total,
|
||||
}
|
||||
}
|
||||
|
||||
/** 只返回筛选范围总数,不加载工单 JSON、取消事件和当前页关联字段。 */
|
||||
export async function countWorkOrders(input: ListInput = {}): Promise<number> {
|
||||
const { joins, whereClause, params } = buildWorkOrderWhere(input)
|
||||
return countWorkOrdersWithWhere(joins, whereClause, params)
|
||||
}
|
||||
|
||||
async function countWorkOrdersWithWhere(
|
||||
joins: string,
|
||||
whereClause: string,
|
||||
params: unknown[],
|
||||
): Promise<number> {
|
||||
const result = await query<{ total: number }>(
|
||||
`SELECT COUNT(*)::int AS total FROM work_orders wo ${joins} ${whereClause}`,
|
||||
params,
|
||||
)
|
||||
return Number(result.rows[0]?.total || 0)
|
||||
}
|
||||
|
||||
/** 按筛选条件汇总工单,统计范围不受当前分页影响。 */
|
||||
export async function getWorkOrderStatistics(input: ListInput = {}): Promise<WorkOrderStatistics> {
|
||||
const { joins, whereClause, params } = buildWorkOrderWhere(input)
|
||||
|
||||
Reference in New Issue
Block a user