admin/django-vue3-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化日期期间条件过滤，包含截止日期当前数据

Browse Source 
因为创建日期是一个datetime数据类型，直接使用lte不会包含截止日的数据

Signed-off-by: 好奇宝宝 <11259906+haoqibb@user.noreply.gitee.com>
This commit is contained in:
好奇宝宝
2024-07-25 01:56:55 +00:00
committed by Gitee
parent c8e235bed6
commit 9a8506448f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/dvadmin/utils/filters.py
View File

@@ -37,11 +37,11 @@ class CoreModelFilterBankend(BaseFilterBackend):
if any([create_datetime_after, create_datetime_before, update_datetime_after, update_datetime_before]): if any([create_datetime_after, create_datetime_before, update_datetime_after, update_datetime_before]):
create_filter = Q() create_filter = Q()
if create_datetime_after and create_datetime_before: if create_datetime_after and create_datetime_before:
create_filter &= Q(create_datetime__gte=create_datetime_after) & Q(create_datetime__lte=create_datetime_before) create_filter &= Q(create_datetime__gte=create_datetime_after) & Q(create_datetime__lte=f'{create_datetime_before} 23:59:59')
elif create_datetime_after: elif create_datetime_after:
create_filter &= Q(create_datetime__gte=create_datetime_after) create_filter &= Q(create_datetime__gte=create_datetime_after)
elif create_datetime_before: elif create_datetime_before:
create_filter &= Q(create_datetime__lte=create_datetime_before) create_filter &= Q(create_datetime__lte=f'{create_datetime_before} 23:59:59')
# 更新时间范围过滤条件 # 更新时间范围过滤条件
update_filter = Q() update_filter = Q()