fix: 修改字段后的bug
This commit is contained in:
parent
0145beb63f
commit
24fa17ddb5
|
@ -18,12 +18,12 @@ def cal_quastat(quastatId: str):
|
||||||
# 月统计
|
# 月统计
|
||||||
params = {
|
params = {
|
||||||
'testitem': ins.testitem,
|
'testitem': ins.testitem,
|
||||||
'product': ins.product,
|
'material': ins.material,
|
||||||
'belong_dept': ins.belong_dept,
|
'belong_dept': ins.belong_dept,
|
||||||
'year': ins.year,
|
'year': ins.year,
|
||||||
'month': ins.month
|
'month': ins.month
|
||||||
}
|
}
|
||||||
results_month = QuaStat.objects.filter(**params).values('belong_dept', 'product',
|
results_month = QuaStat.objects.filter(**params).values('belong_dept', 'material',
|
||||||
'testitem', 'year', 'month').annotate(
|
'testitem', 'year', 'month').annotate(
|
||||||
avg_val_total=Sum(F('avg_val')*F('num_test')),
|
avg_val_total=Sum(F('avg_val')*F('num_test')),
|
||||||
num_test_1=Sum('num_test'),
|
num_test_1=Sum('num_test'),
|
||||||
|
@ -49,7 +49,7 @@ def cal_quastat(quastatId: str):
|
||||||
# 年统计
|
# 年统计
|
||||||
params.pop('month')
|
params.pop('month')
|
||||||
|
|
||||||
results_year = QuaStat.objects.filter(**params).values('belong_dept', 'product',
|
results_year = QuaStat.objects.filter(**params).values('belong_dept', 'material',
|
||||||
'testitem', 'year').annotate(
|
'testitem', 'year').annotate(
|
||||||
avg_val_total=Sum(F('avg_val')*F('num_test')),
|
avg_val_total=Sum(F('avg_val')*F('num_test')),
|
||||||
num_test_1=Sum('num_test'),
|
num_test_1=Sum('num_test'),
|
||||||
|
|
|
@ -28,8 +28,8 @@ class QuaStatViewSet(ListModelMixin, CreateModelMixin, CustomGenericViewSet):
|
||||||
"""
|
"""
|
||||||
queryset = QuaStat.objects.all()
|
queryset = QuaStat.objects.all()
|
||||||
serializer_class = QuaStatSerializer
|
serializer_class = QuaStatSerializer
|
||||||
filterset_fields = ['type', 'year', 'month', 'day', 'product', 'testitem', 'belong_dept', 'sflog']
|
filterset_fields = ['type', 'year', 'month', 'day', 'material', 'testitem', 'belong_dept', 'sflog']
|
||||||
select_related_fields = ['belong_dept', 'product', 'testitem']
|
select_related_fields = ['belong_dept', 'material', 'testitem']
|
||||||
|
|
||||||
def perform_create(self, serializer):
|
def perform_create(self, serializer):
|
||||||
ins = serializer.save()
|
ins = serializer.save()
|
||||||
|
|
Loading…
Reference in New Issue