资金申请时间筛选支持精确到时分并修复截止日SQL括号缺失
This commit is contained in:
@@ -487,7 +487,7 @@ export type FinanceRequestListInput = {
|
||||
status?: string
|
||||
requestType?: string
|
||||
keyword?: string
|
||||
/** 申请时间区间(YYYY-MM-DD,上海时区,含起止日);后台列表筛选使用。 */
|
||||
/** 申请时间区间(YYYY-MM-DD 含全天,或 YYYY-MM-DD HH:mm:ss 精确到秒;上海时区);后台列表筛选使用。 */
|
||||
createdFrom?: string
|
||||
createdTo?: string
|
||||
/** 收款渠道筛选:alipay / wechat */
|
||||
|
||||
@@ -482,14 +482,18 @@ function buildWorkerFinanceRequestWhere({
|
||||
}
|
||||
if (createdFrom) {
|
||||
params.push(createdFrom)
|
||||
// 纯日期字符串 cast 后即当天 00:00:00;带时间则精确到秒
|
||||
filters.push(
|
||||
`wfr.created_at >= ($${params.length}::date)::timestamp AT TIME ZONE 'Asia/Shanghai'`,
|
||||
`wfr.created_at >= ($${params.length}::timestamp) AT TIME ZONE 'Asia/Shanghai'`,
|
||||
)
|
||||
}
|
||||
if (createdTo) {
|
||||
params.push(createdTo)
|
||||
// 带时间精确到秒(含截止时刻);纯日期保持含截止日全天
|
||||
filters.push(
|
||||
`wfr.created_at < (($${params.length}::date + 1)::timestamp AT TIME ZONE 'Asia/Shanghai')`,
|
||||
createdTo.length > 10
|
||||
? `wfr.created_at <= ($${params.length}::timestamp) AT TIME ZONE 'Asia/Shanghai'`
|
||||
: `wfr.created_at < (($${params.length}::date + 1)::timestamp) AT TIME ZONE 'Asia/Shanghai'`,
|
||||
)
|
||||
}
|
||||
if (requestId) {
|
||||
|
||||
Reference in New Issue
Block a user