合理化建议查询和导出不一致
This commit is contained in:
parent
c36e42dc70
commit
9706bd0c43
|
@ -4856,10 +4856,20 @@ def apisuggest(req):
|
||||||
companyid = getcompany(userid)
|
companyid = getcompany(userid)
|
||||||
a = Suggest.objects.filter(
|
a = Suggest.objects.filter(
|
||||||
usecomp=Partment.objects.get(partid=companyid))
|
usecomp=Partment.objects.get(partid=companyid))
|
||||||
|
if req.GET.get('jyr', None):
|
||||||
|
a = a.filter(jyr__userid=req.GET.get('jyr'))
|
||||||
|
if req.GET.get('clr', None):
|
||||||
|
a = a.filter(clr__userid=req.GET.get('clr'))
|
||||||
if req.GET.get('qssj'):
|
if req.GET.get('qssj'):
|
||||||
a = a.filter(jyrq__gte=req.GET.get('qssj'))
|
a = a.filter(submittime__gte=req.GET.get('qssj'))
|
||||||
if req.GET.get('jssj'):
|
if req.GET.get('jssj'):
|
||||||
a = a.filter(jyrq__lte=req.GET.get('jssj'))
|
a = a.filter(submittime__lte=req.GET.get('jssj'))
|
||||||
|
if req.GET.get('jyrname', None):
|
||||||
|
a = a.filter(jyr__name__contains=req.GET.get('jyrname'))
|
||||||
|
if req.GET.get('jybm'):
|
||||||
|
parts = Partment.objects.filter(partlink__contains=','+req.GET.get(
|
||||||
|
'jybm')+',') | Partment.objects.filter(partid=req.GET.get('jybm'))
|
||||||
|
a = a.filter(jybm__in=parts)
|
||||||
res = exportxlsx('jy', a)
|
res = exportxlsx('jy', a)
|
||||||
return res
|
return res
|
||||||
elif a == 'exportword':
|
elif a == 'exportword':
|
||||||
|
|
Loading…
Reference in New Issue