From 92c9a519671a7063c7fe2fcc59ca1d2dfad58fac Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 21 Nov 2023 08:45:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Attendance=E4=B8=ADteam=E5=92=8Cpost?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/hrm/serializers.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/hrm/serializers.py b/apps/hrm/serializers.py index e6bf7460..619f0cc0 100755 --- a/apps/hrm/serializers.py +++ b/apps/hrm/serializers.py @@ -269,9 +269,9 @@ class AttendanceSerializer(CustomModelSerializer): source='user.name', read_only=True) belong_dept_name = serializers.CharField( source='user.belong_dept.name', read_only=True) + shift_name = serializers.CharField(source='shift.name', read_only=True) post_name = serializers.CharField( source='user.post.name', read_only=True) - shift_name = serializers.CharField(source='shift.name', read_only=True) team_name = serializers.CharField(source='team.name', read_only=True) work_time_start = serializers.DateTimeField(read_only=True) work_time_end = serializers.DateTimeField(read_only=True) @@ -279,16 +279,12 @@ class AttendanceSerializer(CustomModelSerializer): class Meta: model = Attendance fields = '__all__' + extra_kwargs = {'team': {'required': True}, 'post': {'required': True}} def create(self, validated_data): user = validated_data['user'] shift = validated_data['shift'] work_date = validated_data['work_date'] - post = validated_data.get('post', None) - if post is None: - post = user.post - if post is None: - raise ParseError(f'{user.name}未配置岗位') att = Attendance.objects.filter( user=user, work_date=work_date, shift=shift).first() if att: