trouble bug
This commit is contained in:
parent
7213a29c4e
commit
25705297f5
|
|
@ -1942,7 +1942,7 @@ def troublehandle(req):
|
||||||
userid=userid)).exclude(deletemark=0)
|
userid=userid)).exclude(deletemark=0)
|
||||||
total = a.count()
|
total = a.count()
|
||||||
startnum, endnum = fenye(req)
|
startnum, endnum = fenye(req)
|
||||||
obj = a.order_by('-xgsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj',
|
obj = a.order_by('-fxsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj',
|
||||||
'yhlb__dickeyname', 'todouser__name', 'todouser__userid', 'yhpg__dickeyname', 'yhnum', 'yhdj__dickeyname', 'shresult', 'zgqx')
|
'yhlb__dickeyname', 'todouser__name', 'todouser__userid', 'yhpg__dickeyname', 'yhnum', 'yhdj__dickeyname', 'shresult', 'zgqx')
|
||||||
return HttpResponse(transjson(total, obj), content_type="application/json")
|
return HttpResponse(transjson(total, obj), content_type="application/json")
|
||||||
elif a == 'listself':
|
elif a == 'listself':
|
||||||
|
|
@ -1950,7 +1950,7 @@ def troublehandle(req):
|
||||||
a = Trouble.objects.filter(fxr__userid=userid).exclude(deletemark=0)
|
a = Trouble.objects.filter(fxr__userid=userid).exclude(deletemark=0)
|
||||||
total = a.count()
|
total = a.count()
|
||||||
startnum, endnum = fenye(req)
|
startnum, endnum = fenye(req)
|
||||||
obj = a.order_by('-xgsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj',
|
obj = a.order_by('-fxsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj',
|
||||||
'yhlb__dickeyname', 'todouser__name', 'todouser__userid', 'yhpg__dickeyname', 'yhnum', 'yhdj__dickeyname', 'shresult', 'zgqx')
|
'yhlb__dickeyname', 'todouser__name', 'todouser__userid', 'yhpg__dickeyname', 'yhnum', 'yhdj__dickeyname', 'shresult', 'zgqx')
|
||||||
return HttpResponse(transjson(total, obj), content_type="application/json")
|
return HttpResponse(transjson(total, obj), content_type="application/json")
|
||||||
elif a == 'listall':
|
elif a == 'listall':
|
||||||
|
|
@ -1960,7 +1960,7 @@ def troublehandle(req):
|
||||||
partid=companyid)).exclude(deletemark=0)
|
partid=companyid)).exclude(deletemark=0)
|
||||||
total = a.count()
|
total = a.count()
|
||||||
startnum, endnum = fenye(req)
|
startnum, endnum = fenye(req)
|
||||||
obj = a.order_by('-xgsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj',
|
obj = a.order_by('-fxsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj',
|
||||||
'yhlb__dickeyname', 'todouser__name', 'todouser__userid', 'yhpg__dickeyname', 'yhnum', 'yhdj__dickeyname', 'shresult', 'zgqx')
|
'yhlb__dickeyname', 'todouser__name', 'todouser__userid', 'yhpg__dickeyname', 'yhnum', 'yhdj__dickeyname', 'shresult', 'zgqx')
|
||||||
return HttpResponse(transjson(total, obj), content_type="application/json")
|
return HttpResponse(transjson(total, obj), content_type="application/json")
|
||||||
elif a == 'listsearch':
|
elif a == 'listsearch':
|
||||||
|
|
@ -2025,7 +2025,7 @@ def troublehandle(req):
|
||||||
a = a.filter(yhqy__id=yhqy)
|
a = a.filter(yhqy__id=yhqy)
|
||||||
total = a.count()
|
total = a.count()
|
||||||
startnum, endnum = fenye(req)
|
startnum, endnum = fenye(req)
|
||||||
obj = a.order_by('-xgsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj',
|
obj = a.order_by('-fxsj')[startnum:endnum].values('troubleid', 'fxr__userid', 'fxr__name', 'yhms', 'yhzt', 'fxsj', 'tbsj',
|
||||||
'yhlb__dickeyname', 'todouser__name', 'yhpg__dickeyname', 'yhnum', 'yhdj__dickeyname', 'shresult', 'zgqx', 'yhtp', 'zghtp')
|
'yhlb__dickeyname', 'todouser__name', 'yhpg__dickeyname', 'yhnum', 'yhdj__dickeyname', 'shresult', 'zgqx', 'yhtp', 'zghtp')
|
||||||
return HttpResponse(transjson(total, obj), content_type="application/json")
|
return HttpResponse(transjson(total, obj), content_type="application/json")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue