培训排序bug
This commit is contained in:
parent
7068c0311a
commit
c653c98528
|
@ -3117,7 +3117,7 @@ def pxhandle(req):
|
||||||
userid = req.session['userid']
|
userid = req.session['userid']
|
||||||
companyid = getcompany(userid)
|
companyid = getcompany(userid)
|
||||||
a = Train.objects.filter(usecomp=Partment.objects.get(
|
a = Train.objects.filter(usecomp=Partment.objects.get(
|
||||||
partid=companyid), deletemark=1).order_by('-modifytime')
|
partid=companyid), deletemark=1)
|
||||||
total = a.count()
|
total = a.count()
|
||||||
startnum, endnum = fenye(req)
|
startnum, endnum = fenye(req)
|
||||||
a = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
|
a = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
|
||||||
|
@ -3127,7 +3127,7 @@ def pxhandle(req):
|
||||||
userid = req.session['userid']
|
userid = req.session['userid']
|
||||||
companyid = getcompany(userid)
|
companyid = getcompany(userid)
|
||||||
a = Train.objects.filter(usecomp=Partment.objects.get(
|
a = Train.objects.filter(usecomp=Partment.objects.get(
|
||||||
partid=companyid), deletemark=1, submituser__userid=userid).order_by('-modifytime')
|
partid=companyid), deletemark=1, submituser__userid=userid)
|
||||||
total = a.count()
|
total = a.count()
|
||||||
startnum, endnum = fenye(req)
|
startnum, endnum = fenye(req)
|
||||||
a = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
|
a = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
|
||||||
|
@ -3137,10 +3137,10 @@ def pxhandle(req):
|
||||||
userid = req.session['userid']
|
userid = req.session['userid']
|
||||||
companyid = getcompany(userid)
|
companyid = getcompany(userid)
|
||||||
a = Trainuser.objects.filter(participant=User.objects.get(
|
a = Trainuser.objects.filter(participant=User.objects.get(
|
||||||
userid=userid), train__deletemark=1).order_by('-train__modifytime')
|
userid=userid), train__deletemark=1).order_by('-train__starttime')
|
||||||
total = a.count()
|
total = a.count()
|
||||||
startnum, endnum = fenye(req)
|
startnum, endnum = fenye(req)
|
||||||
a = a.order_by('-starttime')[startnum:endnum].values('train__trainnum', 'train__trainid', 'train__state', 'train__trainplace',
|
a = a[startnum:endnum].values('train__trainnum', 'train__trainid', 'train__state', 'train__trainplace',
|
||||||
'train__starttime', 'train__trainname', 'checked', 'train__teacher', 'train__lecturer__name')
|
'train__starttime', 'train__trainname', 'checked', 'train__teacher', 'train__lecturer__name')
|
||||||
return HttpResponse(transjson(total, a), content_type="application/json")
|
return HttpResponse(transjson(total, a), content_type="application/json")
|
||||||
elif req.GET.get('a') == 'dqdnum':
|
elif req.GET.get('a') == 'dqdnum':
|
||||||
|
|
Loading…
Reference in New Issue