From b944e383355405907bbd6af4378e388ecbe8a3bc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 28 Apr 2021 11:19:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?inspecttask=E5=A2=9E=E5=8A=A0template=5Fnam?= =?UTF-8?q?e=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/quality/serializers.py | 7 +++++++ 1 file changed, 7 insertions(+) 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 From 6e52e39adfbd78e5475ee418d2f18c927c9c2902 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 28 Apr 2021 11:40:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=92=88=E5=AF=B9=E8=AF=A5=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=9A=84=E6=A3=80=E6=9F=A5=E5=BC=80=E5=A7=8B=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/quality/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)