From e78511b5568ca314e24224213b126dcf7e282bca Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 16 Apr 2024 15:01:33 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/em/serializers.py | 50 +++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/apps/em/serializers.py b/apps/em/serializers.py index 883d6ca0..dd6c88ec 100644 --- a/apps/em/serializers.py +++ b/apps/em/serializers.py @@ -9,63 +9,57 @@ from rest_framework.exceptions import ValidationError class EcateSerializer(CustomModelSerializer): class Meta: model = Ecate - fields = '__all__' + fields = "__all__" read_only_fields = EXCLUDE_FIELDS_BASE class EquipmentSerializer(CustomModelSerializer): - belong_dept = serializers.PrimaryKeyRelatedField( - label='责任部门', queryset=Dept.objects.all()) - keeper_name = serializers.CharField(source='keeper.name', read_only=True) - belong_dept_name = serializers.CharField( - source='belong_dept.name', read_only=True) - mgroup_name = serializers.CharField(source='mgroup.name', read_only=True) - cate_name = serializers.CharField(source='cate.name', read_only=True) - cate_code = serializers.CharField(source='cate.code', read_only=True) + belong_dept = serializers.PrimaryKeyRelatedField(label="责任部门", queryset=Dept.objects.all()) + keeper_name = serializers.CharField(source="keeper.name", read_only=True) + belong_dept_name = serializers.CharField(source="belong_dept.name", read_only=True) + mgroup_name = serializers.CharField(source="mgroup.name", read_only=True) + cate_name = serializers.CharField(source="cate.name", read_only=True) + cate_code = serializers.CharField(source="cate.code", read_only=True) full_name = serializers.SerializerMethodField() def validate(self, attrs): - mgroup = attrs.get('mgroup', None) + mgroup = attrs.get("mgroup", None) if mgroup: - attrs['belong_dept'] = mgroup.belong_dept - cate = attrs.get('cate', None) + attrs["belong_dept"] = mgroup.belong_dept + cate = attrs.get("cate", None) if cate: - attrs['type'] = cate.type + attrs["type"] = cate.type return super().validate(attrs) def get_full_name(self, obj): - return f'{obj.number}|{obj.name}|{obj.model}' + return f"{obj.number}|{obj.name}|{obj.model}" class Meta: model = Equipment - fields = '__all__' - read_only_fields = EXCLUDE_FIELDS + \ - ['check_date', 'next_check_date', 'keeper_name', 'belong_dept_name'] + fields = "__all__" + read_only_fields = EXCLUDE_FIELDS + ["check_date", "next_check_date", "keeper_name", "belong_dept_name", "running_state"] class EcheckRecordSerializer(CustomModelSerializer): - equipment_name = serializers.StringRelatedField( - source='equipment', read_only=True) + equipment_name = serializers.StringRelatedField(source="equipment", read_only=True) class Meta: model = EcheckRecord - fields = '__all__' + fields = "__all__" read_only_fields = EXCLUDE_FIELDS def validate(self, attrs): - check_date = attrs['check_date'] - if EcheckRecord.objects.filter(check_date__gte=check_date, equipment=attrs['equipment']).exists(): - raise ValidationError('检定日期小于历史记录') + check_date = attrs["check_date"] + if EcheckRecord.objects.filter(check_date__gte=check_date, equipment=attrs["equipment"]).exists(): + raise ValidationError("检定日期小于历史记录") return attrs class EInspectSerializer(CustomModelSerializer): - equipment_name = serializers.StringRelatedField( - source='equipment', read_only=True) - inspect_user_name = serializers.CharField( - source='inspect_user.name', read_only=True) + equipment_name = serializers.StringRelatedField(source="equipment", read_only=True) + inspect_user_name = serializers.CharField(source="inspect_user.name", read_only=True) class Meta: model = EInspect - fields = '__all__' + fields = "__all__" read_only_fields = EXCLUDE_FIELDS