From 89123441ece25e4b1581efd6d92e042a332c989c Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 25 Feb 2020 14:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8E=92=E5=90=8D=20part?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/safesite/views.py b/safesite/views.py index d0645f4c..31debc3a 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -15,7 +15,7 @@ from uuid import UUID import os import time from datetime import datetime, date, timedelta -from django.db.models import F, Count, Sum +from django.db.models import F, Count, Sum, Avg import requests from .tasks import send_wechatmsgs, send_wechatmsg, yjjs, gettime, yjjs_px, yjjs_yl, updateTzzs, updateAqzs, yjjs_gc, yjjs_ws from .export import exportdoc, exportxlsx, exportyjdoc, exportsimplexlsx, exportdoc2 @@ -6204,8 +6204,9 @@ def apiexamtestrate(req): objslist = list(objs) for i in objslist: i['rate'] = objslist.index(i) + 1 + orgsCal = ExamTestDetail.objects.filter(examtest__in=alltest,ison=1,score>0).values('user__ubelongpart__partid','user__ubelongpart__partname').annotate(totaltest=Count('user__ubelongpart__partid'),avgscore=Avg('score'),totaluser=Count('user__userid')) with open('ratedata.dat','wb') as f: - pickle.dump({'total':total,'rows':objslist,'updatetime':datetime.now().strftime('%Y-%m-%d %H:%M')},f) + pickle.dump({'total':total,'rows':objslist,'rows2':list(orgsCal),'updatetime':datetime.now().strftime('%Y-%m-%d %H:%M')},f) return JsonResponse({"code": 1})