feat: attendance增加返回字段
This commit is contained in:
parent
d1f183237d
commit
058e9ce5c3
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 3.2.12 on 2023-11-17 11:09
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('hrm', '0018_alter_attendance_unique_together'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='attendance',
|
||||
name='note',
|
||||
field=models.TextField(blank=True, default='', verbose_name='备注信息'),
|
||||
),
|
||||
]
|
|
@ -105,7 +105,7 @@ class Attendance(CommonADModel):
|
|||
work_time_end = models.DateTimeField('工作结束时间')
|
||||
state = models.CharField('状态', max_length=20,
|
||||
choices=ATT_STATE_CHOICES, default='pending', help_text=str(ATT_STATE_CHOICES))
|
||||
note = models.TextField('备注信息', default='')
|
||||
note = models.TextField('备注信息', default='', blank=True)
|
||||
|
||||
class Meta:
|
||||
unique_together = ('employee', 'work_date', 'shift')
|
||||
|
|
|
@ -267,6 +267,8 @@ class CorrectSerializer(serializers.Serializer):
|
|||
class AttendanceSerializer(CustomModelSerializer):
|
||||
employee_name = serializers.CharField(
|
||||
source='employee.name', read_only=True)
|
||||
belong_dept_name = serializers.CharField(
|
||||
source='employee.belong_dept.name', read_only=True)
|
||||
post_name = serializers.CharField(
|
||||
source='employee.post.name', read_only=True)
|
||||
shift_name = serializers.CharField(source='shift.name', read_only=True)
|
||||
|
|
|
@ -253,7 +253,8 @@ class AttendanceViewSet(CustomModelViewSet):
|
|||
serializer_class = AttendanceSerializer
|
||||
select_related_fields = ['employee',
|
||||
'employee__belong_dept', 'employee__post', 'shift']
|
||||
filterset_fields = ['employee', 'employee__belong_dept', 'state']
|
||||
filterset_fields = ['employee',
|
||||
'employee__belong_dept', 'employee__post', 'state']
|
||||
ordering = ['-create_time']
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue