diff --git a/apps/hrm/migrations/0025_leave.py b/apps/hrm/migrations/0025_leave.py new file mode 100644 index 00000000..d06641a8 --- /dev/null +++ b/apps/hrm/migrations/0025_leave.py @@ -0,0 +1,40 @@ +# Generated by Django 3.2.12 on 2026-01-07 01:18 + +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 = [ + ('wf', '0006_auto_20251215_1645'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('hrm', '0024_emppersoninfo_post'), + ] + + operations = [ + migrations.CreateModel( + name='Leave', + fields=[ + ('id', models.CharField(editable=False, help_text='主键ID', max_length=20, 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='删除标记')), + ('start_date', models.DateTimeField(verbose_name='开始日期')), + ('end_date', models.DateTimeField(verbose_name='结束日期')), + ('leave_type', models.PositiveSmallIntegerField(blank=True, choices=[(10, '事假'), (20, '病假'), (30, '婚假'), (40, '丧假'), (50, '公假'), (60, '工伤'), (70, '产假'), (80, '护理假'), (90, '其他')], null=True, verbose_name='请假类型')), + ('reason', models.TextField(verbose_name='请假事由')), + ('hour', models.PositiveSmallIntegerField(blank=True, null=True, verbose_name='请假时长')), + ('file', models.TextField(blank=True, null=True, verbose_name='证明')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='leave_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('employee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hrm.employee', verbose_name='员工')), + ('ticket', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='leave_ticket', to='wf.ticket', verbose_name='关联工单')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='leave_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/apps/hrm/models.py b/apps/hrm/models.py index ea529535..29707d9f 100755 --- a/apps/hrm/models.py +++ b/apps/hrm/models.py @@ -245,4 +245,29 @@ class EmpPersonInfo(CommonADModel): phone = models.CharField('手机号', max_length=20,validators=[PHONE_VALIDATOR], null=True, blank=True) post = models.CharField('岗位', max_length=20, null=True, blank=True) note = models.TextField('备注', null=True, blank=True) - \ No newline at end of file + + +class Leave(CommonADModel): + """ + TN:员工请假 + """ + E_TYPE_CHOISE = ( + (10, '事假'), + (20, '病假'), + (30, '婚假'), + (40, '丧假'), + (50, '公假'), + (60, '工伤'), + (70, '产假'), + (80, '护理假'), + (90, '其他'), + ) + employee = models.ForeignKey(Employee, verbose_name='员工', on_delete=models.CASCADE) + start_date = models.DateTimeField('开始日期') + end_date = models.DateTimeField('结束日期') + leave_type = models.PositiveSmallIntegerField('请假类型', choices=E_TYPE_CHOISE, null=True, blank=True) + reason = models.TextField('请假事由') + hour = models.PositiveSmallIntegerField('请假时长', null=True, blank=True) + file = models.TextField('证明', null=True, blank=True) + ticket = models.OneToOneField('wf.ticket', verbose_name='关联工单', + on_delete=models.CASCADE, related_name='leave_ticket', null=True, blank=True) \ No newline at end of file diff --git a/apps/hrm/serializers.py b/apps/hrm/serializers.py index 7dd697d9..1ff98ace 100755 --- a/apps/hrm/serializers.py +++ b/apps/hrm/serializers.py @@ -9,7 +9,7 @@ from django.utils import timezone from apps.utils.serializers import CustomModelSerializer from apps.utils.constants import EXCLUDE_FIELDS from apps.hrm.models import (Certificate, ClockRecord, Employee, - NotWorkRemark, Attendance, Resignation, EmpNeed, EmpJoin, EmpPersonInfo) + NotWorkRemark, Attendance, Resignation, EmpNeed, EmpJoin, EmpPersonInfo, Leave) from apps.system.serializers import DeptSimpleSerializer, UserSimpleSerializer from django.db import transaction from django.core.cache import cache @@ -368,3 +368,12 @@ class EmpPersonInfoSerializer(CustomModelSerializer): 'note', ) +class LeaveSerializer(CustomModelSerializer): + ticket_ = TicketSimpleSerializer(source='ticket', read_only=True) + employee_name = serializers.CharField(source='employee.name', read_only=True) + post_name = serializers.CharField(source="employee.post.name", read_only=True) + belong_dept_name = serializers.CharField(source='employee.belong_dept.name', read_only=True) + class Meta: + model = Leave + fields = '__all__' + diff --git a/apps/hrm/urls.py b/apps/hrm/urls.py index 5154e3f4..da6516a2 100755 --- a/apps/hrm/urls.py +++ b/apps/hrm/urls.py @@ -1,5 +1,5 @@ from apps.hrm.views import (CertificateViewSet, ClockRecordViewSet, EmployeeViewSet, NotWorkRemarkViewSet, EmpNeedViewSet, - AttendanceViewSet, ResignationViewSet, EmpJoinViewSet) + AttendanceViewSet, ResignationViewSet, EmpJoinViewSet, LeaveViewSet) from django.urls import path, include from rest_framework.routers import DefaultRouter @@ -16,6 +16,7 @@ router.register('attendance', AttendanceViewSet, basename='attendance') router.register('resignation', ResignationViewSet, basename='resignation') router.register('empneed', EmpNeedViewSet, basename='empneed') router.register('empjoin', EmpJoinViewSet, basename='empjoin') +router.register('leave', LeaveViewSet, basename='leave') urlpatterns = [ path(API_BASE_URL, include(router.urls)), ] diff --git a/apps/hrm/views.py b/apps/hrm/views.py index 51324568..4ffbe71b 100755 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -12,7 +12,7 @@ from rest_framework.response import Response from apps.hrm.errors import NO_NEED_LEVEL_REMARK from apps.hrm.filters import (CertificateFilterSet, ClockRecordFilterSet, EmployeeFilterSet, NotWorkRemarkFilterSet) -from apps.hrm.models import Certificate, ClockRecord, Employee, NotWorkRemark, Attendance, Resignation, EmpNeed, EmpJoin +from apps.hrm.models import Certificate, ClockRecord, Employee, NotWorkRemark, Attendance, Resignation, EmpNeed, EmpJoin, Leave from apps.hrm.serializers import (CertificateCreateUpdateSerializer, CertificateSerializer, ChannelAuthoritySerializer, EmpJoinSerializer, ClockRecordListSerializer, EmployeeCreateUpdateSerializer, EmployeeDetailSerializer, EmployeeImproveSerializer, @@ -20,7 +20,7 @@ from apps.hrm.serializers import (CertificateCreateUpdateSerializer, Certificate EmployeeSerializer, ClockRecordSimpleSerializer, ClockRecordCreateSerializer, NotWorkRemarkListSerializer, CorrectSerializer, AttendanceSerializer, - ResignationSerializer, EmpNeedSerializer) + ResignationSerializer, EmpNeedSerializer, LeaveSerializer) from apps.hrm.services import HrmService from apps.third.dahua import dhClient @@ -453,3 +453,19 @@ class EmpJoinViewSet(TicketMixin, EuModelViewSet): serializer = EmpPersonInfoSerializer(data=person, many=True) serializer.is_valid(raise_exception=True) serializer.save() + + +class LeaveViewSet(TicketMixin, EuModelViewSet): + select_related_fields = [ + 'employee', + 'employee__belong_dept', + 'ticket', + ] + queryset = Leave.objects.all() + serializer_class = LeaveSerializer + filterset_fields = ['leave_type', 'employee__belong_dept'] + search_fields = ["employee__name", "leave_type"] + workflow_key = "wf_leave" + + def gen_other_ticket_data(self, instance): + return {"hour": instance.hour if instance.hour else None} \ No newline at end of file