|
18 | 18 | from django.db import models |
19 | 19 | from django.db.models import QuerySet, Q |
20 | 20 | from django.http import StreamingHttpResponse |
| 21 | +from django.utils import timezone |
21 | 22 | from django.utils.translation import gettext_lazy as _, gettext |
22 | 23 | from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE |
23 | 24 | from rest_framework import serializers |
@@ -74,12 +75,14 @@ def is_valid(self, *, raise_exception=False): |
74 | 75 | raise AppApiException(500, _('Application id does not exist')) |
75 | 76 |
|
76 | 77 | def get_end_time(self): |
77 | | - return datetime.datetime.combine( |
78 | | - datetime.datetime.strptime(self.data.get('end_time'), '%Y-%m-%d'), |
79 | | - datetime.datetime.max.time()) |
| 78 | + d = datetime.datetime.strptime(self.data.get('end_time'), '%Y-%m-%d').date() |
| 79 | + naive = datetime.datetime.combine(d, datetime.time.max) |
| 80 | + return timezone.make_aware(naive, timezone.get_default_timezone()) |
80 | 81 |
|
81 | 82 | def get_start_time(self): |
82 | | - return self.data.get('start_time') |
| 83 | + d = datetime.datetime.strptime(self.data.get('start_time'), '%Y-%m-%d').date() |
| 84 | + naive = datetime.datetime.combine(d, datetime.time.min) |
| 85 | + return timezone.make_aware(naive, timezone.get_default_timezone()) |
83 | 86 |
|
84 | 87 | def get_query_set(self, select_ids=None): |
85 | 88 | end_time = self.get_end_time() |
|
0 commit comments