From a240e698df082a8d252ca7a29877d749197b1688 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Thu, 24 Oct 2019 09:11:52 +0800 Subject: [PATCH] ddd --- groups/views.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/groups/views.py b/groups/views.py index 95f047d1..c4c4a465 100644 --- a/groups/views.py +++ b/groups/views.py @@ -95,23 +95,6 @@ def observeChart(request):#行为观察 hjzj=[]#环境整洁 first_day,first_day_of_next_month = gettime(datetime(year,month,1)) companys = GroupUser.objects.get(id = request.session['user_id']).group.members.all() - Observe = s_models.Observe.objects.filter(deletemark=1,usecomp__in=companys,looktime__range=(first_day, first_day_of_next_month)).values('usecomp__partid','usecomp__partname').annotate(number = Count('lookid')) - for j in Observe: - - for i in s_models.Dicclass.objects.filter(parentid__dicid=23): - if i.dicid==24: - userfy.append(s_models.Unsafes.objects.filter(observe__in=j,unsafedicclass=i).count()) - elif i.dicid==25: - userwz.append(s_models.Unsafes.objects.filter(observe__in=j,unsafedicclass=i).count()) - elif i.dicid==26: - grfh.append(s_models.Unsafes.objects.filter(observe__in=j,unsafedicclass=i).count()) - elif i.dicid==27: - gjhsb.append(s_models.Unsafes.objects.filter(observe__in=j,unsafedicclass=i).count()) - elif i.dicid==28: - cxhbz.append(s_models.Unsafes.objects.filter(observe__in=j,unsafedicclass=i).count()) - elif i.dicid==29: - rtgcx.append(s_models.Unsafes.objects.filter(observe__in=j,unsafedicclass=i).count()) - elif i.dicid==30: - hjzj.append(s_models.Unsafes.objects.filter(observe__in=j,unsafedicclass=i).count()) + - return HttpResponse(json.dumps({'code':1,'data':{'list':list(Observe)},'userfy':userfy,'userwz':userwz,'grfh':grfh,'gjhsb':gjhsb,'cxhbz':cxhbz,'rtgcx':rtgcx,'hjzj':hjzj,}), content_type='application/json') \ No newline at end of file + return HttpResponse(json.dumps({'code':companys}), content_type='application/json') \ No newline at end of file