From 3d90952cba609fb8410dd1de0e8392e654c53bdc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 18 Feb 2022 08:45:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E5=B2=97=E8=AF=B4=E6=98=8E=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrm/migrations/0007_auto_20220218_0843.py | 41 +++++++++++++++++++ hb_server/apps/hrm/models.py | 11 +++++ 2 files changed, 52 insertions(+) create mode 100644 hb_server/apps/hrm/migrations/0007_auto_20220218_0843.py diff --git a/hb_server/apps/hrm/migrations/0007_auto_20220218_0843.py b/hb_server/apps/hrm/migrations/0007_auto_20220218_0843.py new file mode 100644 index 0000000..36752f4 --- /dev/null +++ b/hb_server/apps/hrm/migrations/0007_auto_20220218_0843.py @@ -0,0 +1,41 @@ +# Generated by Django 3.2.9 on 2022-02-18 00:43 + +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', '0006_auto_20220217_2155'), + ] + + operations = [ + migrations.AddField( + model_name='employee', + name='not_work_remark', + field=models.CharField(blank=True, max_length=200, null=True, verbose_name='当前未打卡说明'), + ), + migrations.CreateModel( + name='NotWorkRemark', + 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='删除标记')), + ('year', models.PositiveSmallIntegerField(default=2022, verbose_name='年')), + ('month', models.PositiveSmallIntegerField(default=2, verbose_name='月')), + ('day', models.PositiveSmallIntegerField(default=1, verbose_name='日')), + ('remark', models.CharField(blank=True, max_length=200, null=True, verbose_name='未打卡说明')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='notworkremark_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='notworkremark_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='用户')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/hb_server/apps/hrm/models.py b/hb_server/apps/hrm/models.py index ed3a063..fb202be 100644 --- a/hb_server/apps/hrm/models.py +++ b/hb_server/apps/hrm/models.py @@ -32,6 +32,7 @@ class Employee(CommonAModel): face_data = models.JSONField('人脸识别数据', null=True, blank=True) is_atwork = models.BooleanField('当前在岗', default=False) last_check_time = models.DateTimeField('打卡时间', null=True, blank=True) + not_work_remark = models.CharField('当前未打卡说明', null=True, blank=True, max_length=200) class Meta: verbose_name = '员工补充信息' verbose_name_plural = verbose_name @@ -39,6 +40,16 @@ class Employee(CommonAModel): def __str__(self): return self.name +class NotWorkRemark(CommonAModel): + """ + 离岗说明 + """ + year = models.PositiveSmallIntegerField('年', default=2022) + month = models.PositiveSmallIntegerField('月', default=2) + day = models.PositiveSmallIntegerField('日', default=1) + user = models.ForeignKey(User, verbose_name='用户', on_delete=models.CASCADE) + remark = models.CharField('未打卡说明', null=True, blank=True, max_length=200) + class ClockRecord(CommonADModel): """ 打卡记录