From 4fc59dfaa6fe4a547f5866b8886329236cefb1bb Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 28 Jan 2022 21:39:15 +0800 Subject: [PATCH] =?UTF-8?q?riskact=20list=20bug;=E9=87=87=E7=BA=B3?= =?UTF-8?q?=E5=B9=B6=E5=BD=92=E6=A1=A3=E8=AF=A5=E5=BB=BA=E8=AE=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/safesite/views.py b/safesite/views.py index df4e56fa..382b64b1 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -4919,6 +4919,15 @@ def apisuggest(req): Suggestflow.objects.create( suggest=obj, user=User.objects.get(userid=userid), action='未采纳该建议') return JsonResponse({"code": 1}) + else: + obj.jyzt = 4 + obj.todouser = None + obj.jyfk = data['jyfk'] + obj.accept = 1 + obj.save() + Suggestflow.objects.create( + suggest=obj, user=User.objects.get(userid=userid), action='采纳该建议') + return JsonResponse({"code": 1}) else: obj.jyzt = 4 obj.todouser = None @@ -7683,9 +7692,9 @@ def apiriskact(req): groups = Group.objects.filter(users=User.objects.get(userid=userid)) objs = RiskAct.objects.filter(group__in=groups) if req.GET.get('table_type', None): - a = a.filter(table_type=req.GET.get('table_type')) + objs = objs.filter(table_type=req.GET.get('table_type')) else: - a = a.filter(table_type=1) + objs = objs.filter(table_type=1) if req.GET.get('area'): objs = objs.filter(area__id=req.GET.get('area')) if req.GET.get('type'): @@ -8265,13 +8274,13 @@ def apiriskacttask(req): 'riskact__group__groupid', 'riskact__name', 'riskact__level', 'riskact__tasktype', 'taskadd', 'taskexpire', 'user__userid', 'usable', 'user__name') return HttpResponse(transjson(total, objs), content_type="application/json") elif a == 'listself': # 排查记录 - a = RiskActTask.objects.filter(user__userid=userid) + objs = RiskActTask.objects.filter(user__userid=userid) objs = objs.filter(riskact__table_type=req.GET.get('table_type', 1)) - total = a.count() + total = objs.count() startnum, endnum = fenye(req) - a = a.order_by('-id')[startnum:endnum].values('id', 'riskact__level', 'riskact__name', 'riskact__area__name', 'riskact__place', + objs = objs.order_by('-id')[startnum:endnum].values('id', 'riskact__level', 'riskact__name', 'riskact__area__name', 'riskact__place', 'taskdo', 'state', 'usable', 'riskact__group__groupname', 'taskadd', 'taskexpire', 'user__userid', 'riskact__id', 'user__name') - return HttpResponse(transjson(total, a), content_type="application/json") + return HttpResponse(transjson(total, objs), content_type="application/json") elif a == 'listmytodo': # 待办 groups = Group.objects.filter(users__userid=userid) objs = RiskActTask.objects.filter(