增加userstandardserializer
This commit is contained in:
parent
bcf99f1515
commit
50344dfca2
|
@ -1,7 +1,7 @@
|
|||
from rest_framework import serializers
|
||||
from apps.mtm.models import RecordForm, RecordFormField
|
||||
from apps.mtm.serializers import RecordFormFieldSerializer, RecordFormSimpleSerializer
|
||||
from apps.system.serializers import FileSimpleSerializer, UserSimpleSerializer
|
||||
from apps.system.serializers import FileSimpleSerializer, UserSimpleSerializer, UserStandardSerializer
|
||||
from apps.wpm.serializers import WProductBaseSerializer
|
||||
from .models import Standard, TestItem, TestRecord, TestRecordItem
|
||||
from django.db import transaction
|
||||
|
@ -98,8 +98,8 @@ class TestRecordDetailSerializer(serializers.ModelSerializer):
|
|||
# record_data = TestRecordItemSerializer(source='item_test_record', read_only=True, many=True)
|
||||
record_data = serializers.SerializerMethodField()
|
||||
origin_test_ = TestRecordDetailBaseSerializer(source='origin_test', read_only=True)
|
||||
create_by_ = UserSimpleSerializer(source='create_by', read_only=True)
|
||||
update_by_ = UserSimpleSerializer(source='update_by', read_only=True)
|
||||
create_by_ = UserStandardSerializer(source='create_by', read_only=True)
|
||||
update_by_ = UserStandardSerializer(source='update_by', read_only=True)
|
||||
wproduct_ = WProductBaseSerializer(source='wproduct', read_only=True)
|
||||
class Meta:
|
||||
model = TestRecord
|
||||
|
|
|
@ -122,16 +122,20 @@ class OrganizationSimpleSerializer(serializers.ModelSerializer):
|
|||
fields = ['id', 'name']
|
||||
|
||||
class UserSimpleSerializer(serializers.ModelSerializer):
|
||||
signature= serializers.SerializerMethodField()
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ['id', 'username', 'name']
|
||||
|
||||
class UserStandardSerializer(serializers.ModelSerializer):
|
||||
signature= serializers.SerializerMethodField()
|
||||
class Meta:
|
||||
model = User
|
||||
fields = ['id', 'username', 'name', 'signature']
|
||||
|
||||
def get_signature(self, obj):
|
||||
if obj.employee_user:
|
||||
return obj.employee_user.signature
|
||||
return None
|
||||
|
||||
# class UserStandardSerializer(serializers.ModelSerializer):
|
||||
# dept_name = serializers.StringRelatedField(source='dept')
|
||||
# class Meta:
|
||||
|
|
Loading…
Reference in New Issue