Commit b1b146c9 by dong

fix20221222

parent b9305c06
...@@ -1711,134 +1711,155 @@ def search_carrier_build(): ...@@ -1711,134 +1711,155 @@ def search_carrier_build():
try: try:
if all([build_name, district_name, build_type]): if all([build_name, district_name, build_type]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name, # CarrierBuild.district_name == district_name,
CarrierBuild.build_type.like('%{}%'.format(build_type)), # CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.upload_people_id == user_id)) # CarrierBuild.upload_people_id == user_id))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name, # CarrierBuild.district_name == district_name,
CarrierBuild.build_type.like('%{}%'.format(build_type)), # CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.upload_people_belong == belong_unit)) # CarrierBuild.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过的内容 # if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.district_name == district_name,
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name, CarrierBuild.district_name == district_name,
CarrierBuild.build_type.like('%{}%'.format(build_type)), CarrierBuild.build_type.like('%{}%'.format(build_type))))
CarrierBuild.audit_status.in_([1, 3])))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif all([build_name, district_name]): elif all([build_name, district_name]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name, # CarrierBuild.district_name == district_name,
CarrierBuild.upload_people_id == user_id)) # CarrierBuild.upload_people_id == user_id))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name, # CarrierBuild.district_name == district_name,
CarrierBuild.upload_people_belong == belong_unit)) # CarrierBuild.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过的内容 # if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.district_name == district_name,
# CarrierBuild.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.district_name == district_name, CarrierBuild.district_name == district_name))
CarrierBuild.audit_status.in_([1, 3])))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif all([build_name, build_type]): elif all([build_name, build_type]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.build_type.like('%{}%'.format(build_type)), # CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.upload_people_id == user_id)) # CarrierBuild.upload_people_id == user_id))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.build_type.like('%{}%'.format(build_type)), # CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.upload_people_belong == belong_unit)) # CarrierBuild.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.build_type.like('%{}%'.format(build_type)), CarrierBuild.build_type.like('%{}%'.format(build_type))))
CarrierBuild.audit_status.in_([1, 3])))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif all([district_name, build_type]): elif all([district_name, build_type]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
CarrierBuild.build_type.like('%{}%'.format(build_type)), # CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.upload_people_id == user_id) # CarrierBuild.upload_people_id == user_id)
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
CarrierBuild.build_type.like('%{}%'.format(build_type)), # CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.upload_people_belong == belong_unit) # CarrierBuild.upload_people_belong == belong_unit)
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
# CarrierBuild.build_type.like('%{}%'.format(build_type)),
# CarrierBuild.audit_status.in_([1, 3]))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name), carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name),
CarrierBuild.build_type.like('%{}%'.format(build_type)), CarrierBuild.build_type.like('%{}%'.format(build_type)))
CarrierBuild.audit_status.in_([1, 3]))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif any([build_name, district_name, build_type]): elif any([build_name, district_name, build_type]):
if build_name: if build_name:
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.upload_people_id == user_id)) # CarrierBuild.upload_people_id == user_id))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.upload_people_belong == belong_unit)) # CarrierBuild.upload_people_belong == belong_unit))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_name.like('%{}%'.format(build_name)),
CarrierBuild.audit_status.in_([1, 3]))) # CarrierBuild.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(CarrierBuild.build_name.like('%{}%'.format(build_name)))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
if district_name: if district_name:
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name, # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
CarrierBuild.upload_people_id == user_id)) # CarrierBuild.upload_people_id == user_id))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name, # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
CarrierBuild.upload_people_belong == belong_unit)) # CarrierBuild.upload_people_belong == belong_unit))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name, # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.district_name == district_name,
CarrierBuild.audit_status.in_([1, 3]))) # CarrierBuild.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(CarrierBuild.district_name == district_name)
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
if build_type: if build_type:
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.upload_people_id == user_id)) # CarrierBuild.upload_people_id == user_id))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.upload_people_belong == belong_unit)) # CarrierBuild.upload_people_belong == belong_unit))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)), # carrier_obj = CarrierBuild.query.filter(and_(CarrierBuild.build_type.like('%{}%'.format(build_type)),
CarrierBuild.audit_status.in_([1, 3]))) # CarrierBuild.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(CarrierBuild.build_type.like('%{}%'.format(build_type)))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
else: # 无参数,搜索全部 else: # 无参数,搜索全部
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_id == user_id) # carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_id == user_id)
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_belong == belong_unit) # carrier_obj = CarrierBuild.query.filter(CarrierBuild.upload_people_belong == belong_unit)
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierBuild.query.filter(CarrierBuild.audit_status.in_([1, 3])) # carrier_obj = CarrierBuild.query.filter(CarrierBuild.audit_status.in_([1, 3]))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierBuild.query.filter(CarrierBuild.id > 0)
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
build_obj_list = carrier_obj.order_by(CarrierBuild.upload_time.desc()).paginate(page, per_page).items build_obj_list = carrier_obj.order_by(CarrierBuild.upload_time.desc()).paginate(page, per_page).items
...@@ -2090,148 +2111,174 @@ def search_carrier_factory(): ...@@ -2090,148 +2111,174 @@ def search_carrier_factory():
carrier_obj = '' carrier_obj = ''
try: try:
if all([district_name, factory_name, is_standard]): if all([district_name, factory_name, is_standard]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name, # CarrierFactory.district_name == district_name,
CarrierFactory.is_standard == is_standard, # CarrierFactory.is_standard == is_standard,
CarrierFactory.upload_people_id == user_id)) # CarrierFactory.upload_people_id == user_id))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name, # CarrierFactory.district_name == district_name,
CarrierFactory.is_standard == is_standard, # CarrierFactory.is_standard == is_standard,
CarrierFactory.upload_people_belong == belong_unit)) # CarrierFactory.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过的内容 # if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.district_name == district_name,
# CarrierFactory.is_standard == is_standard,
# CarrierFactory.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name, CarrierFactory.district_name == district_name,
CarrierFactory.is_standard == is_standard, CarrierFactory.is_standard == is_standard))
CarrierFactory.audit_status.in_([1, 3])))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif all([factory_name, district_name]): elif all([factory_name, district_name]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name, # CarrierFactory.district_name == district_name,
CarrierFactory.upload_people_id == user_id)) # CarrierFactory.upload_people_id == user_id))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name, # CarrierFactory.district_name == district_name,
CarrierFactory.upload_people_belong == belong_unit)) # CarrierFactory.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过的内容 # if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.district_name == district_name,
# CarrierFactory.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.district_name == district_name, CarrierFactory.district_name == district_name))
CarrierFactory.audit_status.in_([1, 3])))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif all([factory_name, is_standard]): elif all([factory_name, is_standard]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.is_standard == is_standard, # CarrierFactory.is_standard == is_standard,
CarrierFactory.upload_people_id == user_id)) # CarrierFactory.upload_people_id == user_id))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.is_standard == is_standard, # CarrierFactory.is_standard == is_standard,
CarrierFactory.upload_people_belong == belong_unit)) # CarrierFactory.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.is_standard == is_standard,
# CarrierFactory.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.is_standard == is_standard, CarrierFactory.is_standard == is_standard))
CarrierFactory.audit_status.in_([1, 3])))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif all([district_name, is_standard]): elif all([district_name, is_standard]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.district_name == district_name), # and_(CarrierFactory.district_name == district_name),
CarrierFactory.is_standard == is_standard, # CarrierFactory.is_standard == is_standard,
CarrierFactory.upload_people_id == user_id) # CarrierFactory.upload_people_id == user_id)
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.district_name == district_name), # and_(CarrierFactory.district_name == district_name),
CarrierFactory.is_standard == is_standard, # CarrierFactory.is_standard == is_standard,
CarrierFactory.upload_people_belong == belong_unit) # CarrierFactory.upload_people_belong == belong_unit)
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.district_name == district_name),
# CarrierFactory.is_standard == is_standard,
# CarrierFactory.audit_status.in_([1, 3]))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.district_name == district_name), and_(CarrierFactory.district_name == district_name),
CarrierFactory.is_standard == is_standard, CarrierFactory.is_standard == is_standard)
CarrierFactory.audit_status.in_([1, 3]))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
elif any([factory_name, district_name, is_standard]): elif any([factory_name, district_name, is_standard]):
if factory_name: if factory_name:
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.upload_people_id == user_id)) # CarrierFactory.upload_people_id == user_id))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierFactory.query.filter( # carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), # and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
CarrierFactory.upload_people_belong == belong_unit)) # CarrierFactory.upload_people_belong == belong_unit))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierFactory.query.filter(
# and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)),
# CarrierFactory.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter( carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)), CarrierFactory.factory_name.like('%{}%'.format(factory_name)))
CarrierFactory.audit_status.in_([1, 3])))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
if district_name: if district_name:
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name, # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
CarrierFactory.upload_people_id == user_id)) # CarrierFactory.upload_people_id == user_id))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name, # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
CarrierFactory.upload_people_belong == belong_unit)) # CarrierFactory.upload_people_belong == belong_unit))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name, # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.district_name == district_name,
CarrierFactory.audit_status.in_([1, 3]))) # CarrierFactory.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(CarrierFactory.district_name == district_name)
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
if is_standard: if is_standard:
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard, # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
CarrierFactory.upload_people_id == user_id)) # CarrierFactory.upload_people_id == user_id))
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard, # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
CarrierFactory.upload_people_belong == belong_unit)) # CarrierFactory.upload_people_belong == belong_unit))
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard, # carrier_obj = CarrierFactory.query.filter(and_(CarrierFactory.is_standard == is_standard,
CarrierFactory.audit_status.in_([1, 3]))) # CarrierFactory.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(CarrierFactory.is_standard == is_standard)
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
else: # 无参数,搜索全部 else: # 无参数,搜索全部
if role_id == 3: # 如果是办事员智能看到自己提报的内容 # if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_id == user_id) # carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_id == user_id)
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容 # if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_belong == belong_unit) # carrier_obj = CarrierFactory.query.filter(CarrierFactory.upload_people_belong == belong_unit)
#
carrier_size = carrier_obj.count() # carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容 # if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierFactory.query.filter(CarrierFactory.audit_status.in_([1, 3])) # carrier_obj = CarrierFactory.query.filter(CarrierFactory.audit_status.in_([1, 3]))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierFactory.query.filter(CarrierFactory.id > 0)
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
factory_obj_list = carrier_obj.order_by(CarrierFactory.upload_time.desc()).paginate(page, per_page).items factory_obj_list = carrier_obj.order_by(CarrierFactory.upload_time.desc()).paginate(page, per_page).items
if factory_obj_list: if factory_obj_list:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment