zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检查表新修改

This commit is contained in:
caoqianming 2022-11-21 10:51:54 +08:00
parent a85fd26d8b
commit 9a427ba594
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
safesite/views.py
View File

@ -8066,6 +8066,18 @@ def apirisk(req):
a = a.values('id', 'step', 'hazard', 'result', 'level', 'riskl', 'riske', 'riskc', 'riskd', 'measure1', 'measure2', a = a.values('id', 'step', 'hazard', 'result', 'level', 'riskl', 'riske', 'riskc', 'riskd', 'measure1', 'measure2',
'measure3', 'measure4', 'measure5', 'riskact__name', 'riskact__area__name', 'measure3', 'measure4', 'measure5', 'riskact__name', 'riskact__area__name',
'riskact__area__id', 'riskact__place', 'content', 'createtime') 'riskact__area__id', 'riskact__place', 'content', 'createtime')
if req.GET.get('riskacttask', None):
riskids = []
taskdo_dict = {}
for i in a:
riskids.append(i.id)
checks = Riskcheck2.objects.filter(riskacttask__id=req.GET.get('riskacttask')).values('risk__id', 'trouble__troubleid', 'trouble__yhnum')
for m in checks:
taskdo_dict[str(m.risk__id)] = m
for n in a:
if str(n.id) in taskdo_dict:
n.trouble = taskdo_dict[str(n.id)].trouble__troubleid
n.yhnum = taskdo_dict[str(n.id)].trouble__yhnum
return HttpResponse(transjson(total, a), content_type="application/json") return HttpResponse(transjson(total, a), content_type="application/json")
elif a == 'listall2': # 按风险点聚合 elif a == 'listall2': # 按风险点聚合
a = Risk.objects.filter(usecomp__partid=companyid, a = Risk.objects.filter(usecomp__partid=companyid,
@ -8464,16 +8476,18 @@ def apiriskcheck2(req):
obj.taskdo = nowtime obj.taskdo = nowtime
obj.note = data['note'] if 'note' in data else None obj.note = data['note'] if 'note' in data else None
obj.save() obj.save()
has_trouble = False
for i in checkrisks: for i in checkrisks:
risk = Risk.objects.get(id=i['id']) risk = Risk.objects.get(id=i['id'])
if 'trouble' in i: if 'trouble' in i:
Riskcheck2.objects.create(risk=risk, riskacttask=obj, trouble=Trouble.objects.get( trouble = Trouble.objects.get(troubleid=i['trouble'])
troubleid=i['trouble']), dotime=nowtime) Riskcheck2.objects.get_or_create(risk=risk, riskacttask=obj, defaults={'risk': risk, 'riskacttask': obj, 'trouble': trouble, 'dotime': nowtime})
obj.state = 0 has_trouble = True
obj.save()
else: else:
Riskcheck2.objects.create( Riskcheck2.objects.get_or_create(risk=risk, riskacttask=obj, defaults={'risk': risk, 'riskacttask': obj, 'dotime': nowtime})
risk=risk, riskacttask=obj, dotime=nowtime) if has_trouble:
obj.state = 0
obj.save()
return JsonResponse({'code': 1}) return JsonResponse({'code': 1})
elif a == 'listall': elif a == 'listall':
objs = Riskcheck2.objects.filter(risk__usecomp__partid=companyid) objs = Riskcheck2.objects.filter(risk__usecomp__partid=companyid)
@ -8484,6 +8498,13 @@ def apiriskcheck2(req):
objs = objs.order_by('trouble')[startnum:endnum].values('id','risk', 'risk__step', 'risk__level','trouble', 'trouble__yhnum', 'risk__hazard', objs = objs.order_by('trouble')[startnum:endnum].values('id','risk', 'risk__step', 'risk__level','trouble', 'trouble__yhnum', 'risk__hazard',
'risk__result', 'risk__measure1', 'risk__measure2', 'risk__measure3', 'risk__measure4', 'risk__measure5', 'riskacttask', 'riskacttask__taskdo') 'risk__result', 'risk__measure1', 'risk__measure2', 'risk__measure3', 'risk__measure4', 'risk__measure5', 'riskacttask', 'riskacttask__taskdo')
return HttpResponse(transjson(total, objs), content_type="application/json") return HttpResponse(transjson(total, objs), content_type="application/json")
elif a == 'check': # 发现隐患2
data = json.loads(req.body.decode('utf-8'))
trouble = Trouble.objects.get(troubleid=data['trouble'])
risk = Risk.objects.get(id=data['risk'])
riskacttask = RiskActTask.objects.get(id=data['riskacttask'])
Riskcheck2.objects.get_or_create(risk=risk, riskacttask=riskacttask, defaults={'risk':risk, 'riskacttask': riskacttask, 'trouble': trouble, 'now': datetime.now()})
return JsonResponse({'code': 1})
@apicheck_login @apicheck_login
def apiriskcheck(req): def apiriskcheck(req):