From b315fc0fea8c7f4afc2a78bc42b1ed4bb8676fdb Mon Sep 17 00:00:00 2001 From: yorn <1057707203@qq.com> Date: Mon, 14 Apr 2025 17:44:30 +0800 Subject: [PATCH] fixed --- app/api/evaluation_points/rules-files.ts | 0 app/api/files/documents.ts | 9 +++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 app/api/evaluation_points/rules-files.ts diff --git a/app/api/evaluation_points/rules-files.ts b/app/api/evaluation_points/rules-files.ts new file mode 100644 index 0000000..e69de29 diff --git a/app/api/files/documents.ts b/app/api/files/documents.ts index f2d9ea0..affa2c5 100644 --- a/app/api/files/documents.ts +++ b/app/api/files/documents.ts @@ -186,20 +186,21 @@ export async function getDocuments(searchParams: DocumentSearchParams = {}): Pro // 处理日期范围 if (searchParams.dateFrom) { // 添加当天开始时间 00:00:00 - filter['created_at'] = `gte.'${searchParams.dateFrom} 00:00:00'`; + filter['created_at'] = `gte.'${dayjs(`${searchParams.dateFrom} 00:00:00`).format()}'`; } if (searchParams.dateTo) { // 如果有开始日期,使用and条件;否则直接设置结束日期 const dateToKey = searchParams.dateFrom ? 'and' : 'created_at'; - + const newDateFrom = dayjs(`${searchParams.dateFrom} 00:00:00`).format(); + const newDateTo = dayjs(`${searchParams.dateTo} 23:59:59`).format(); // 添加当天结束时间 23:59:59 if (dateToKey === 'and') { delete filter['created_at']; // 使用OR操作符连接两个条件 - filter[dateToKey] = `(created_at.gte.'${dayjs(searchParams.dateFrom).format()}',created_at.lte.'${dayjs(searchParams.dateTo).format()}')`; + filter[dateToKey] = `(created_at.gte.'${newDateFrom}',created_at.lte.'${newDateTo}')`; } else { - filter['created_at'] = `lte.'${dayjs(searchParams.dateTo).format()}'`; + filter['created_at'] = `lte.'${newDateTo}'`; } }