diff --git a/server/apps/quality/serializers.py b/server/apps/quality/serializers.py index 038f23a..4af3258 100644 --- a/server/apps/quality/serializers.py +++ b/server/apps/quality/serializers.py @@ -1,3 +1,4 @@ +from re import template from django.db.models.base import Model from rest_framework import serializers from .models import * @@ -30,6 +31,7 @@ class InspectTaskSerializer(serializers.ModelSerializer): create_by_ = UserSimpleSerializer(source='create_by', read_only=True) dept_count = serializers.SerializerMethodField() subtask_count = serializers.SerializerMethodField() + template_name = serializers.CharField(source='template.name', read_only=True) class Meta: model = InspectTask @@ -41,6 +43,11 @@ class InspectTaskSerializer(serializers.ModelSerializer): def get_subtask_count(self, obj): return SubInspectTask.objects.filter(inspecttask=obj, is_deleted=False).count() + @staticmethod + def setup_eager_loading(queryset): + queryset = queryset.select_related('template',) + return queryset + class InspectTaskSimpleSerializer(serializers.ModelSerializer): class Meta: model = InspectTask diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py index feee128..ebca737 100644 --- a/server/apps/quality/views.py +++ b/server/apps/quality/views.py @@ -193,7 +193,7 @@ class InspectDeptViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet): obj = self.get_object() if obj.state == '待检查': obj.state = '检查中' - obj.start_date = timezone.now() + obj.start_date = timezone.now().date() obj.save() return Response(InspectDeptSerializer(instance=obj).data, status=status.HTTP_200_OK) return Response('状态错误', status=status.HTTP_400_BAD_REQUEST)