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

增加userstandardserializer

This commit is contained in:
caoqianming 2022-04-19 13:27:48 +08:00
parent bcf99f1515
commit 50344dfca2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hb_server/apps/qm/serializers.py
View File

@ -1,7 +1,7 @@
from rest_framework import serializers from rest_framework import serializers
from apps.mtm.models import RecordForm, RecordFormField from apps.mtm.models import RecordForm, RecordFormField
from apps.mtm.serializers import RecordFormFieldSerializer, RecordFormSimpleSerializer 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 apps.wpm.serializers import WProductBaseSerializer
from .models import Standard, TestItem, TestRecord, TestRecordItem from .models import Standard, TestItem, TestRecord, TestRecordItem
from django.db import transaction 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 = TestRecordItemSerializer(source='item_test_record', read_only=True, many=True)
record_data = serializers.SerializerMethodField() record_data = serializers.SerializerMethodField()
origin_test_ = TestRecordDetailBaseSerializer(source='origin_test', read_only=True) origin_test_ = TestRecordDetailBaseSerializer(source='origin_test', read_only=True)
create_by_ = UserSimpleSerializer(source='create_by', read_only=True) create_by_ = UserStandardSerializer(source='create_by', read_only=True)
update_by_ = UserSimpleSerializer(source='update_by', read_only=True) update_by_ = UserStandardSerializer(source='update_by', read_only=True)
wproduct_ = WProductBaseSerializer(source='wproduct', read_only=True) wproduct_ = WProductBaseSerializer(source='wproduct', read_only=True)
class Meta: class Meta:
model = TestRecord model = TestRecord

8
hb_server/apps/system/serializers.py
View File

@ -122,16 +122,20 @@ class OrganizationSimpleSerializer(serializers.ModelSerializer):
fields = ['id', 'name'] fields = ['id', 'name']
class UserSimpleSerializer(serializers.ModelSerializer): class UserSimpleSerializer(serializers.ModelSerializer):
signature= serializers.SerializerMethodField()
class Meta: class Meta:
model = User model = User
fields = ['id', 'username', 'name'] 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): def get_signature(self, obj):
if obj.employee_user: if obj.employee_user:
return obj.employee_user.signature return obj.employee_user.signature
return None return None
# class UserStandardSerializer(serializers.ModelSerializer): # class UserStandardSerializer(serializers.ModelSerializer):
# dept_name = serializers.StringRelatedField(source='dept') # dept_name = serializers.StringRelatedField(source='dept')
# class Meta: # class Meta: