From e51d19fac02b64bfa5ac17b4c2540933dac9779f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 6 Jul 2023 14:48:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9D=E5=A7=8B=E5=8C=96=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=BD=95=E5=85=A5=E6=8E=92=E5=BA=8F=E5=8F=8A=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E8=B4=A8=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/qm/views.py | 4 +--- apps/wpm/views.py | 12 +++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/qm/views.py b/apps/qm/views.py index c1440015..c6c29bf2 100644 --- a/apps/qm/views.py +++ b/apps/qm/views.py @@ -42,6 +42,4 @@ class QuaStatViewSet(ListModelMixin, BulkUpdateModelMixin, CustomGenericViewSet) ins = serializer.save() if ins.sflog: # 更新值班记录的质检时间 ins.sflog.last_test_time = datetime.datetime.now() - ins.sflog.save() - # 计算其他方面的统计 - cal_quastat.delay(ins.id) \ No newline at end of file + ins.sflog.save() \ No newline at end of file diff --git a/apps/wpm/views.py b/apps/wpm/views.py index a57c2328..86bf0b72 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -71,12 +71,10 @@ class SfLogViewSet(UpdateModelMixin, ListModelMixin, DestroyModelMixin, CustomGe from apps.qm.models import QuaStat, TestItem from apps.qm.serializers import QuaStatSerializer obj = self.get_object() - test_materials = obj.mgroup.test_materials - for mid in test_materials: - material = Material.objects.get(id=mid) - testitems = material.testitems - for tid in testitems: - testitem = TestItem.objects.get(id=tid) + test_materials = Material.objects.filter(id__in=obj.mgroup.test_materials).order_by('sort', '-create_time') + for material in test_materials: + testitems = TestItem.objects.filter(id__in=material.testitems).order_by('sort', '-create_time') + for testitem in testitems: end_time_local = localtime(obj.end_time) params = {'type': 'sflog', 'material': material, 'testitem': testitem, 'sflog': obj} params_default = params.update({'year_s': end_time_local.year, 'month_s': end_time_local.month, 'day_s': end_time_local.day}) @@ -85,7 +83,7 @@ class SfLogViewSet(UpdateModelMixin, ListModelMixin, DestroyModelMixin, CustomGe ins.create_by = request.user ins.belong_dept = obj.mgroup.belong_dept ins.save() - qs = QuaStat.objects.filter(type='sflog', sflog=obj) + qs = QuaStat.objects.filter(type='sflog', sflog=obj).order_by('material_sort', 'material__create_time', 'testitem__sort', 'testitem__create_time') sr = QuaStatSerializer(instance=qs, many=True) return Response(sr.data)