diff --git a/apps/qm/tasks.py b/apps/qm/tasks.py index eee3932d..88dbd627 100644 --- a/apps/qm/tasks.py +++ b/apps/qm/tasks.py @@ -26,7 +26,7 @@ def cal_quastat(quastatId: str): } results_day = QuaStat.objects.filter(**params).values('belong_dept', 'material', 'testitem', 'year_s', 'month_s', 'day_s').annotate( - avg_val_total=Sum(F('avg_val')*F('num_test')), + avg_val_total=Sum(F('val_avg')*F('num_test')), num_test_1=Sum('num_test'), num_ok_1=Sum('num_ok')).annotate( avg_val_1=ExpressionWrapper(F('avg_val_total')/F('num_test_1'), output_field=FloatField()), @@ -34,7 +34,7 @@ def cal_quastat(quastatId: str): ) for r1 in results_day: stat_params = { - 'avg_val': r1['avg_val_1'], + 'val_avg': r1['avg_val_1'], 'num_test': r1['num_test_1'], 'num_ok': r1['num_ok_1'], 'rate_pass': r1['rate_pass_1'] @@ -50,7 +50,7 @@ def cal_quastat(quastatId: str): params.pop('day_s') results_month = QuaStat.objects.filter(**params).values('belong_dept', 'material', 'testitem', 'year_s', 'month_s').annotate( - avg_val_total=Sum(F('avg_val')*F('num_test')), + avg_val_total=Sum(F('val_avg')*F('num_test')), num_test_1=Sum('num_test'), num_ok_1=Sum('num_ok')).annotate( avg_val_1=ExpressionWrapper(F('avg_val_total')/F('num_test_1'), output_field=FloatField()), @@ -58,7 +58,7 @@ def cal_quastat(quastatId: str): ) for r1 in results_month: stat_params = { - 'avg_val': r1['avg_val_1'], + 'val_avg': r1['avg_val_1'], 'num_test': r1['num_test_1'], 'num_ok': r1['num_ok_1'], 'rate_pass': r1['rate_pass_1'] @@ -76,7 +76,7 @@ def cal_quastat(quastatId: str): results_year = QuaStat.objects.filter(**params).values('belong_dept', 'material', 'testitem', 'year_s').annotate( - avg_val_total=Sum(F('avg_val')*F('num_test')), + avg_val_total=Sum(F('val_avg')*F('num_test')), num_test_1=Sum('num_test'), num_ok_1=Sum('num_ok')).annotate( avg_val_1=ExpressionWrapper(F('avg_val_total')/F('num_test_1'), output_field=FloatField()), @@ -84,7 +84,7 @@ def cal_quastat(quastatId: str): ) for r1 in results_year: stat_params = { - 'avg_val': r1['avg_val_1'], + 'val_avg': r1['avg_val_1'], 'num_test': r1['num_test_1'], 'num_ok': r1['num_ok_1'], 'rate_pass': r1['rate_pass_1'] diff --git a/apps/wpm/views.py b/apps/wpm/views.py index 17d0f598..8b03e645 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -72,11 +72,9 @@ class SfLogViewSet(UpdateModelMixin, ListModelMixin, DestroyModelMixin, CustomGe from apps.qm.serializers import QuaStatSerializer obj = self.get_object() test_materials = obj.mgroup.test_materials - print('m', test_materials) for mid in test_materials: material = Material.objects.get(id=mid) testitems = material.testitems - print('t', testitems) for tid in testitems: testitem = TestItem.objects.get(id=tid) end_time_local = localtime(obj.end_time)