diff --git a/apps/em/serializers.py b/apps/em/serializers.py index e8c9bf7a..834a7299 100644 --- a/apps/em/serializers.py +++ b/apps/em/serializers.py @@ -28,6 +28,9 @@ class EquipmentSerializer(CustomModelSerializer): class EcheckRecordSerializer(CustomModelSerializer): + equipment_name = serializers.CharField( + source='equipment.name', read_only=True) + class Meta: model = EcheckRecord fields = '__all__' @@ -41,6 +44,11 @@ class EcheckRecordSerializer(CustomModelSerializer): class EInspectSerializer(CustomModelSerializer): + equipment_name = serializers.CharField( + source='equipment.name', read_only=True) + inspect_user_name = serializers.CharField( + source='inspect_user.name', read_only=True) + class Meta: model = EInspect fields = '__all__' diff --git a/apps/em/views.py b/apps/em/views.py index 510475fc..3e301c57 100644 --- a/apps/em/views.py +++ b/apps/em/views.py @@ -69,5 +69,5 @@ class EInspectViewSet(CustomModelViewSet): """ queryset = EInspect.objects.all() serializer_class = EInspectSerializer - select_related_fields = ['equipment'] + select_related_fields = ['equipment', 'inspect_user'] filterset_fields = ['equipment']