Merge pull request #3365 from jumpserver/login_log_bugfix

[Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00，到结束时间的23:59:59

apps/audits/models.py

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

apps/audits/templates/audits/login_log_list.html

@@ -121,7 +121,7 @@
             });
         })
         .on('click', '.btn_export', function () {
-            var date_form = $('#id_date_from').val();
+            var date_from = $('#id_date_from').val();
             var date_to = $('#id_date_to').val();
             var user = $('.select2 option:selected').val();
             var keyword = $('#search').val();
@@ -129,7 +129,7 @@
                 url: "{% url "audits:login-log-export" %}",
                 method: 'POST',
                 data: JSON.stringify({
-                    'date_form':date_form,
+                    'date_from':date_from,
                     'date_to':date_to,
                     'user':user,
                     'keyword':keyword

apps/audits/views.py

@@ -267,19 +267,22 @@ class LoginLogExportView(PermissionsMixin, View):
         header = [field.verbose_name for field in fields]
         login_logs = cache.get(request.GET.get('spm', ''), [])
 
-        response = write_content_to_excel(excel_response, login_logs=login_logs,
-                                          header=header, fields=fields)
+        response = write_content_to_excel(
+            excel_response, login_logs=login_logs, header=header, fields=fields
+        )
         return response
 
     def post(self, request):
         try:
-            date_form = json.loads(request.body).get('date_form', [])
+            date_from = json.loads(request.body).get('date_from', [])
             date_to = json.loads(request.body).get('date_to', [])
             user = json.loads(request.body).get('user', [])
             keyword = json.loads(request.body).get('keyword', [])
 
             login_logs = UserLoginLog.get_login_logs(
-                date_form=date_form, date_to=date_to, user=user, keyword=keyword)
+                date_from=date_from, date_to=date_to, user=user,
+                keyword=keyword,
+            )
         except ValueError:
             return HttpResponse('Json object not valid', status=400)
         spm = uuid.uuid4().hex