From db87609ad6cfaf1579fa531bc0e763050812d94c Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 21 Jan 2022 14:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/hrm/migrations/0004_clockrecord.py   | 32 +++++++++++++++++++
 hb_server/apps/hrm/views.py                   |  5 +--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 hb_server/apps/hrm/migrations/0004_clockrecord.py

diff --git a/hb_server/apps/hrm/migrations/0004_clockrecord.py b/hb_server/apps/hrm/migrations/0004_clockrecord.py
new file mode 100644
index 0000000..97ae889
--- /dev/null
+++ b/hb_server/apps/hrm/migrations/0004_clockrecord.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.9 on 2022-01-21 06:45
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('hrm', '0003_employee_face_data'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ClockRecord',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('type', models.PositiveSmallIntegerField(choices=[(10, '上班打卡')], default=10, verbose_name='打卡类型')),
+                ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='clockrecord_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='clockrecord_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py
index 10b4b06..9c533d0 100644
--- a/hb_server/apps/hrm/views.py
+++ b/hb_server/apps/hrm/views.py
@@ -74,8 +74,9 @@ class ClockRecordViewSet(CreateModelMixin, ListModelMixin, GenericViewSet):
         return super().get_serializer_class()
 
     def create(self, request, *args, **kwargs):
-        now = timezone.localtime()
-        if 8<=now.hour<=17:
+        now = timezone.now()
+        now_local = timezone.localtime()
+        if 8<=now_local.hour<=17:
             base64_data = base64.urlsafe_b64decode(tran64(
                 request.data.get('base64').replace(' ', '+')))
             user, msg = HRMService.face_compare_from_base64(base64_data)