Skip to content

M
mancheng
Commit b9305c06 by dong
Options

fix20221222

parent 3b9246b9
Showing with 123 additions and 105 deletions
apps/view_choose/fill_data.py
......@@ -1881,8 +1881,6 @@ def search_carrier_build():
@api_address.route("/SearchCarrierLand", methods=["POST"])
def search_carrier_land():
req_dic = request.get_json()
# token = req_dic['token']
token = request.headers['token']
action_name = '土地搜索'
try:
......@@ -1900,129 +1898,149 @@ def search_carrier_land():
carrier_size = ''
try:
if all([district_name, land_name, land_code]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name,
CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.upload_people_id == user_id))
carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name,
CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过的内容
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name,
CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.audit_status.in_([1, 3])))
CarrierLand.land_code.like('%{}%'.format(land_code))))
carrier_size = carrier_obj.count()
elif all([land_name, district_name]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name,
CarrierLand.upload_people_id == user_id))
carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.district_name == district_name,
# CarrierLand.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name,
CarrierLand.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.district_name == district_name,
CarrierLand.audit_status.in_([1, 3])))
CarrierLand.district_name == district_name))
carrier_size = carrier_obj.count()
elif all([land_name, land_code]):
if role_id == 3: # 如果是办事员智能看到自己提报的内容
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_belong == belong_unit))
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.audit_status.in_([1, 3])))
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.upload_people_id == user_id))
carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.audit_status.in_([1, 3])))
CarrierLand.land_code.like('%{}%'.format(land_code))))
carrier_size = carrier_obj.count()
elif any([district_name, land_name, land_code]):
if land_name:
if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.upload_people_id == user_id))
carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
CarrierLand.audit_status.in_([1, 3])))
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.upload_people_id == user_id))
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(
# and_(CarrierLand.land_name.like('%{}%'.format(land_name)),
# CarrierLand.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.land_name.like('%{}%'.format(land_name)))
carrier_size = carrier_obj.count()
if district_name:
if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
CarrierLand.upload_people_id == user_id))
carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
CarrierLand.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
CarrierLand.audit_status.in_([1, 3])))
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
# CarrierLand.upload_people_id == user_id))
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
# CarrierLand.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.district_name == district_name,
# CarrierLand.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.district_name == district_name)
carrier_size = carrier_obj.count()
if land_code:
if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.upload_people_id == user_id))
carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.upload_people_belong == belong_unit))
carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
CarrierLand.audit_status.in_([1, 3])))
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_id == user_id))
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.upload_people_belong == belong_unit))
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(and_(CarrierLand.land_code.like('%{}%'.format(land_code)),
# CarrierLand.audit_status.in_([1, 3])))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.land_code.like('%{}%'.format(land_code)))
carrier_size = carrier_obj.count()
else: # 无参数，搜索全部
if role_id == 3: # 如果是办事员智能看到自己提报的内容
carrier_obj = CarrierLand.query.filter(CarrierLand.upload_people_id == user_id)
carrier_size = carrier_obj.count()
if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
carrier_obj = CarrierLand.query.filter(CarrierLand.upload_people_belong == belong_unit)
carrier_size = carrier_obj.count()
if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
carrier_obj = CarrierLand.query.filter(CarrierLand.audit_status.in_([1, 3]))
# if role_id == 3: # 如果是办事员智能看到自己提报的内容
# carrier_obj = CarrierLand.query.filter(CarrierLand.upload_people_id == user_id)
#
# carrier_size = carrier_obj.count()
# if role_id == 2: # 市直部门这区县领导智能看到该部门所有办事员提报的内容
# carrier_obj = CarrierLand.query.filter(CarrierLand.upload_people_belong == belong_unit)
#
# carrier_size = carrier_obj.count()
# if role_id == 1: # 局领导能看到所有审核通过和自己驳回的内容
# carrier_obj = CarrierLand.query.filter(CarrierLand.audit_status.in_([1, 3]))
#
# carrier_size = carrier_obj.count()
carrier_obj = CarrierLand.query.filter(CarrierLand.id > 0)
carrier_size = carrier_obj.count()
land_obj_list = carrier_obj.order_by(CarrierLand.upload_time.desc()).paginate(page, per_page).items
if land_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