lensman_list 新增筛选项
1 mainītis faili ar 9 papildinājumiem un 6 dzēšanām
+ 9
- 6
api/lensman_admin_views.py
@@ -2,6 +2,8 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from __future__ import division |
| 4 | 4 |
|
| 5 |
+from datetime import datetime |
|
| 6 |
+ |
|
| 5 | 7 |
from django.conf import settings |
| 6 | 8 |
from django_logit import logit |
| 7 | 9 |
from django_response import response |
@@ -21,10 +23,8 @@ def lensman_list(request, administrator): |
||
| 21 | 23 |
query = request.POST.get('query', '')
|
| 22 | 24 |
lensman_status = request.POST.get('lensman_status', '')
|
| 23 | 25 |
end_date = tc.to_date(request.POST.get('end_date', ''))
|
| 24 |
- integral_end_date_start = tc.to_date( |
|
| 25 |
- request.POST.get('integral_end_date_start', ''))
|
|
| 26 |
- integral_end_date_end = tc.to_date( |
|
| 27 |
- request.POST.get('integral_end_date_end', ''))
|
|
| 26 |
+ integral_end_date_start = request.POST.get('integral_end_date_start', '')
|
|
| 27 |
+ integral_end_date_end = request.POST.get('integral_end_date_end', '')
|
|
| 28 | 28 |
|
| 29 | 29 |
logs = LensmanInfo.objects.filter(status=True).order_by('-pk')
|
| 30 | 30 |
|
@@ -39,8 +39,11 @@ def lensman_list(request, administrator): |
||
| 39 | 39 |
logs = logs.filter(end_date__lte=end_date) |
| 40 | 40 |
|
| 41 | 41 |
if integral_end_date_start and integral_end_date_end: |
| 42 |
- logs = logs.filter(integral_end_date__lte=integral_end_date_end, |
|
| 43 |
- integral_end_date__gte=integral_end_date_start) |
|
| 42 |
+ ftime = datetime.strptime( |
|
| 43 |
+ integral_end_date_start + ' 00:00:00', '%Y%m%d %H:%M:%S') |
|
| 44 |
+ ttime = datetime.strptime( |
|
| 45 |
+ integral_end_date_end + ' 23:59:59', '%Y%m%d %H:%M:%S') |
|
| 46 |
+ logs = logs.filter(integral_end_date__range=[ftime, ttime]) |
|
| 44 | 47 |
|
| 45 | 48 |
count = logs.count() |
| 46 | 49 |
logs, left = pagination(logs, page, num) |