[Update] 优化登录日志时间范围

apps/audits/models.py

@@ -88,13 +88,11 @@ class UserLoginLog(models.Model):
     datetime = models.DateTimeField(default=timezone.now, verbose_name=_('Date login'))
 
     @classmethod
-    def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None, date_format=None):
+    def get_login_logs(cls, date_from=None, date_to=None, user=None, keyword=None):
         login_logs = cls.objects.all()
         if date_from and date_to:
-            date_from = timezone.datetime.strptime(date_from, date_format)
-            date_to = timezone.datetime.strptime(
-                date_to + ' 23:59:59', date_format + ' %H:%M:%S'
-            )
+            date_from = "{} {}".format(date_from, '00:00:00')
+            date_to = "{} {}".format(date_to, '23:59:59')
             login_logs = login_logs.filter(
                 datetime__gte=date_from, datetime__lte=date_to
             )

apps/audits/views.py

@@ -282,7 +282,7 @@ class LoginLogExportView(PermissionsMixin, View):
 
             login_logs = UserLoginLog.get_login_logs(
                 date_from=date_from, date_to=date_to, user=user,
-                keyword=keyword, date_format=self.date_format
+                keyword=keyword,
             )
         except ValueError:
             return HttpResponse('Json object not valid', status=400)