From f30c2b974131096c365a47330cc179ab1962d57f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 21 Jan 2022 14:43:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E8=AE=B0=E5=BD=95=20timzone?=
 =?UTF-8?q?=20localtime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/hrm/tasks.py |  8 ++++++++
 hb_server/apps/hrm/views.py | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 hb_server/apps/hrm/tasks.py

diff --git a/hb_server/apps/hrm/tasks.py b/hb_server/apps/hrm/tasks.py
new file mode 100644
index 0000000..bd4449b
--- /dev/null
+++ b/hb_server/apps/hrm/tasks.py
@@ -0,0 +1,8 @@
+from __future__ import absolute_import, unicode_literals
+
+from celery import shared_task
+
+
+@shared_task
+def x():
+    print('ok')
\ No newline at end of file
diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py
index ca60ee6..10b4b06 100644
--- a/hb_server/apps/hrm/views.py
+++ b/hb_server/apps/hrm/views.py
@@ -74,14 +74,16 @@ class ClockRecordViewSet(CreateModelMixin, ListModelMixin, GenericViewSet):
         return super().get_serializer_class()
 
     def create(self, request, *args, **kwargs):
-        base64_data = base64.urlsafe_b64decode(tran64(request.data.get('base64').replace(' ', '+')))
-        user, msg = HRMService.face_compare_from_base64(base64_data)
-        if user:
-            now = timezone.now()
-            if 8<=now.hour<=17:
+        now = timezone.localtime()
+        if 8<=now.hour<=17:
+            base64_data = base64.urlsafe_b64decode(tran64(
+                request.data.get('base64').replace(' ', '+')))
+            user, msg = HRMService.face_compare_from_base64(base64_data)
+            if user:
                 ins, created = ClockRecord.objects.get_or_create(
                     create_by=request.user, create_time__hour__range = [8,18], 
-                    create_time__year=now.year, create_time__month=now.month, create_time__day=now.day,
+                    create_time__year=now.year, create_time__month=now.month, 
+                    create_time__day=now.day,
                     defaults={
                         'type':ClockRecord.ClOCK_WORK1,
                         'create_by':user,
@@ -94,8 +96,9 @@ class ClockRecordViewSet(CreateModelMixin, ListModelMixin, GenericViewSet):
                 user.is_atwork = True
                 user.save()
                 return Response(UserSimpleSerializer(instance=user).data)
-            return Response('非打卡时间范围', status=status.HTTP_400_BAD_REQUEST)
-        return Response(msg, status=status.HTTP_400_BAD_REQUEST)
+            return Response(msg, status=status.HTTP_400_BAD_REQUEST)
+        return Response('非打卡时间范围', status=status.HTTP_400_BAD_REQUEST)
+