From 525dd98ef706e66b6f9b60ffdc076ac35537f89a Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 17 Dec 2020 14:39:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=BB=9F=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E8=B6=85=E7=AE=A1=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- groups/views.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/groups/views.py b/groups/views.py index 85d1f8d8..7e30cb61 100644 --- a/groups/views.py +++ b/groups/views.py @@ -483,9 +483,9 @@ def exam_rate(request): ninety_count_t = 0 for i in companys: # 员工数 - user_count = s_models.User.objects.filter(usecomp=i, deletemark=1).count() + user_count = s_models.User.objects.filter(usecomp=i, deletemark=1, issuper=0).count() # 参加考试员工数/考次数 - base = s_models.ExamTestDetail.objects.filter(user__usecomp=i, user__deletemark=1, testnum__gte=1).exclude(examtest__nousecomps__contains=','+str(i.partid)+',') + base = s_models.ExamTestDetail.objects.filter(user__usecomp=i, user__deletemark=1, testnum__gte=1, user__issuper=0).exclude(examtest__nousecomps__contains=','+str(i.partid)+',') if start: base = base.filter(examtest__starttime__gte=start) if end: @@ -505,9 +505,9 @@ def exam_rate(request): # 90以上得分率 rate3 = ninety_count/user_count if user_count else 0 # rate1 = '%.2f' % (rate1*100) - rate1 = int(rate1*100+0.5) - rate2 = int(rate2*100+0.5) - rate3 = int(rate3*100+0.5) + rate1 = int(rate1*100+0.5) if int(rate1*100+0.5)<101 else 100 + rate2 = int(rate2*100+0.5) if int(rate2*100+0.5)<101 else 100 + rate3 = int(rate3*100+0.5) if int(rate3*100+0.5)<101 else 100 ret['x']['data'].append(i.partname) ret['s'][0]['data'].append(rate1) ret['s'][1]['data'].append(rate3) @@ -520,9 +520,9 @@ def exam_rate(request): rate2_t = full_count_t/user_count_t if user_count_t else 0 rate3_t = ninety_count_t/user_count_t if user_count_t else 0 ret['x']['data'].insert(0, groupuser.group.groupname) - ret['s'][0]['data'].insert(0, int(rate1_t*100+0.5)) - ret['s'][1]['data'].insert(0, int(rate3_t*100+0.5)) - ret['s'][2]['data'].insert(0, int(rate2_t*100+0.5)) + ret['s'][0]['data'].insert(0, int(rate1_t*100+0.5) if int(rate1_t*100+0.5)<101 else 100) + ret['s'][1]['data'].insert(0, int(rate3_t*100+0.5) if int(rate3_t*100+0.5)<101 else 100) + ret['s'][2]['data'].insert(0, int(rate2_t*100+0.5) if int(rate2_t*100+0.5)<101 else 100) return HttpResponse(json.dumps({'code':200,'data':ret}), content_type='application/json')