zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复quastat task

This commit is contained in:
caoqianming 2023-07-05 16:02:28 +08:00
parent 965e3169ba
commit eef4beebb4
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/qm/tasks.py
View File

@ -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']

2
apps/wpm/views.py
View File

@ -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)