zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Attendance中team和post设置为必填

This commit is contained in:
caoqianming 2023-11-21 08:45:25 +08:00
parent dd2189900f
commit 92c9a51967
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/hrm/serializers.py
View File

@ -269,9 +269,9 @@ class AttendanceSerializer(CustomModelSerializer):
source='user.name', read_only=True) source='user.name', read_only=True)
belong_dept_name = serializers.CharField( belong_dept_name = serializers.CharField(
source='user.belong_dept.name', read_only=True) source='user.belong_dept.name', read_only=True)
shift_name = serializers.CharField(source='shift.name', read_only=True)
post_name = serializers.CharField( post_name = serializers.CharField(
source='user.post.name', read_only=True) 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) team_name = serializers.CharField(source='team.name', read_only=True)
work_time_start = serializers.DateTimeField(read_only=True) work_time_start = serializers.DateTimeField(read_only=True)
work_time_end = serializers.DateTimeField(read_only=True) work_time_end = serializers.DateTimeField(read_only=True)
@ -279,16 +279,12 @@ class AttendanceSerializer(CustomModelSerializer):
class Meta: class Meta:
model = Attendance model = Attendance
fields = '__all__' fields = '__all__'
extra_kwargs = {'team': {'required': True}, 'post': {'required': True}}
def create(self, validated_data): def create(self, validated_data):
user = validated_data['user'] user = validated_data['user']
shift = validated_data['shift'] shift = validated_data['shift']
work_date = validated_data['work_date'] 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( att = Attendance.objects.filter(
user=user, work_date=work_date, shift=shift).first() user=user, work_date=work_date, shift=shift).first()
if att: if att: