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

隐患导入检查类型等字段存储bug

This commit is contained in:
caoqianming 2021-01-29 22:03:01 +08:00
parent 104a3ae8fe
commit e2dad9f25f
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
safesite/daoru.py
View File

@ -175,15 +175,20 @@ def drtodotroubles(companyid,path,userid):
parts = Partment.objects.filter(partlink__contains=',' + companyid + ',')|Partment.objects.filter(partid=companyid) #获取所有部门 parts = Partment.objects.filter(partlink__contains=',' + companyid + ',')|Partment.objects.filter(partid=companyid) #获取所有部门
for i in parts: for i in parts:
partdict[i.partname] = i partdict[i.partname] = i
for i in Dickey.objects.filter(dicparent__dicid=14): for i in Dickey.objects.filter(dicparent__dicid=14).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
companyid+',')).exclude(nousecomps__contains=','+companyid+','):
jclxdict[i.dickeyname] = i jclxdict[i.dickeyname] = i
for i in Dickey.objects.filter(dicparent__dicid=18): for i in Dickey.objects.filter(dicparent__dicid=18).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
companyid+',')).exclude(nousecomps__contains=','+companyid+','):
yhdjdict[i.dickeyname] = i yhdjdict[i.dickeyname] = i
for i in Dickey.objects.filter(dicparent__dicid=15): for i in Dickey.objects.filter(dicparent__dicid=15).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
companyid+',')).exclude(nousecomps__contains=','+companyid+','):
yhlxdicto[i.dickeyname] = i yhlxdicto[i.dickeyname] = i
for i in Dickey.objects.filter(Q(dicparent__dicid=16)|Q(dicparent__dicid=17)): for i in Dickey.objects.filter(Q(dicparent__dicid=16)|Q(dicparent__dicid=17)).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
companyid+',')).exclude(nousecomps__contains=','+companyid+','):
yhlbdict[i.dickeyname] = i yhlbdict[i.dickeyname] = i
for i in Dickey.objects.filter(dicparent__dicid=19): for i in Dickey.objects.filter(dicparent__dicid=19).filter(Q(usecomps__contains=',1,')|Q(usecomps__contains=',' +
companyid+',')).exclude(nousecomps__contains=','+companyid+','):
yhpgdict[i.dickeyname] = i yhpgdict[i.dickeyname] = i
for i in Area.objects.filter(usecomp__partid=companyid): for i in Area.objects.filter(usecomp__partid=companyid):
yhqydict[i.name]=i yhqydict[i.name]=i
@ -230,9 +235,9 @@ def drtodotroubles(companyid,path,userid):
fxsj = fxsj.replace(' ','') fxsj = fxsj.replace(' ','')
if '-' in fxsj: if '-' in fxsj:
obj.fxsj = datetime.strptime(fxsj,'%Y-%m-%d').date() obj.fxsj = datetime.strptime(fxsj,'%Y-%m-%d').date()
elif '.' in fdate: elif '.' in fxsj:
obj.fxsj = datetime.strptime(fxsj,'%Y.%m.%d').date() obj.fxsj = datetime.strptime(fxsj,'%Y.%m.%d').date()
elif '/' in fdate: elif '/' in fxsj:
obj.fxsj = datetime.strptime(fxsj,'%Y/%m/%d').date() obj.fxsj = datetime.strptime(fxsj,'%Y/%m/%d').date()
if yhqy in yhqydict: if yhqy in yhqydict:
obj.yhqy = yhqydict[yhqy] obj.yhqy = yhqydict[yhqy]
@ -256,9 +261,9 @@ def drtodotroubles(companyid,path,userid):
zgqx = zgqx.replace(' ','') zgqx = zgqx.replace(' ','')
if '-' in zgqx: if '-' in zgqx:
obj.zgqx = datetime.strptime(zgqx,'%Y-%m-%d').date() obj.zgqx = datetime.strptime(zgqx,'%Y-%m-%d').date()
elif '.' in fdate: elif '.' in zgqx:
obj.zgqx = datetime.strptime(zgqx,'%Y.%m.%d').date() obj.zgqx = datetime.strptime(zgqx,'%Y.%m.%d').date()
elif '/' in fdate: elif '/' in zgqx:
obj.zgqx = datetime.strptime(zgqx,'%Y/%m/%d').date() obj.zgqx = datetime.strptime(zgqx,'%Y/%m/%d').date()
if yyfx: if yyfx:
obj.yyfx = yyfx obj.yyfx = yyfx

4
safesite/views.py
View File

@ -1963,7 +1963,7 @@ def troublehandle(req):
troubleid = req.GET.get('troubleid') troubleid = req.GET.get('troubleid')
a = Trouble.objects.filter(troubleid=troubleid) a = Trouble.objects.filter(troubleid=troubleid)
x = a.values('yhnum', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj', 'yhlb__dickeyname', 'yhpg__dickeyname', 'yhdd', 'fxbm__partname', 'yhdj__dickeyname', 'yhpg__dickeyname', x = a.values('yhnum', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj', 'yhlb__dickeyname', 'yhpg__dickeyname', 'yhdd', 'fxbm__partname', 'yhdj__dickeyname', 'yhpg__dickeyname',
'jclx__dickeyname', 'yhlx__dicname', 'yyfx', 'zgcs', 'yhtp', 'zghtp', 'zgms', 'zgbm__partname', 'zgr__name', 'zgqx', 'yhqy__name', 'yhqy__id', 'yhlxo', 'yhlxo__dickeyname')[0] 'jclx__dickeyname', 'yhlx__dicname', 'yyfx', 'zgcs', 'yhtp', 'zghtp', 'zgms', 'zgbm__partname', 'zgr__name', 'zgqx', 'yhqy__name', 'yhqy__id', 'yhlxo', 'yhlxo__dickeyname', 'fxbm', 'jclx')[0]
b = TroubleAccess.objects.filter(troubleid=a[0]).order_by( b = TroubleAccess.objects.filter(troubleid=a[0]).order_by(
'accesssj').values('clr__name', 'opinion', 'action', 'accesssj') 'accesssj').values('clr__name', 'opinion', 'action', 'accesssj')
x['lcxq'] = list(b) x['lcxq'] = list(b)
@ -7843,6 +7843,8 @@ def apitroublefollowtask(req):
data = json.loads(req.body.decode('utf-8')) data = json.loads(req.body.decode('utf-8'))
TroubleFollowTask.objects.filter(id=data['id']).update(usable=0) TroubleFollowTask.objects.filter(id=data['id']).update(usable=0)
return JsonResponse({'code': 1}) return JsonResponse({'code': 1})
elif a=='mytodonum':
return JsonResponse({'code': 1, 'mytodonum':TroubleFollowTask.objects.filter(user__userid=userid,usable=1).count()})
def apiriskacttask(req): def apiriskacttask(req):
a = req.GET.get('a') a = req.GET.get('a')