修复撤单 造成打手已超时订单问题
This commit is contained in:
@@ -1219,7 +1219,18 @@ export async function getWorkerOrderOverview(workerId: number | string): Promise
|
|||||||
AND wos.worker_id = $1
|
AND wos.worker_id = $1
|
||||||
AND wos.status != 'cancelled'
|
AND wos.status != 'cancelled'
|
||||||
WHERE wo.assigned_worker_id = $1
|
WHERE wo.assigned_worker_id = $1
|
||||||
OR wo.last_assigned_worker_id = $1
|
OR (
|
||||||
|
wo.last_assigned_worker_id = $1
|
||||||
|
AND (
|
||||||
|
wo.status <> 'open'
|
||||||
|
OR EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM work_order_events timeout_event
|
||||||
|
WHERE timeout_event.work_order_id = wo.id
|
||||||
|
AND timeout_event.event_type = 'timeout_reopen'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
OR wos.id IS NOT NULL
|
OR wos.id IS NOT NULL
|
||||||
)
|
)
|
||||||
SELECT
|
SELECT
|
||||||
@@ -3410,7 +3421,18 @@ function buildWorkOrderWhere({
|
|||||||
params.push(workerSharingId)
|
params.push(workerSharingId)
|
||||||
filters.push(
|
filters.push(
|
||||||
`(wo.assigned_worker_id = $${params.length}
|
`(wo.assigned_worker_id = $${params.length}
|
||||||
OR wo.last_assigned_worker_id = $${params.length}
|
OR (
|
||||||
|
wo.last_assigned_worker_id = $${params.length}
|
||||||
|
AND (
|
||||||
|
wo.status <> 'open'
|
||||||
|
OR EXISTS (
|
||||||
|
SELECT 1
|
||||||
|
FROM work_order_events timeout_event
|
||||||
|
WHERE timeout_event.work_order_id = wo.id
|
||||||
|
AND timeout_event.event_type = 'timeout_reopen'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
OR wo.id IN (
|
OR wo.id IN (
|
||||||
SELECT work_order_id FROM work_order_shares
|
SELECT work_order_id FROM work_order_shares
|
||||||
WHERE worker_id = $${params.length} AND status != 'cancelled'
|
WHERE worker_id = $${params.length} AND status != 'cancelled'
|
||||||
|
|||||||
Reference in New Issue
Block a user