Skip to content

M
mancheng
Commit 5667e92b by dong
Options

fix20230303

parent 8b22b940
Showing with 37 additions and 28 deletions
apps/view_xiaocx/view.py
......@@ -79,8 +79,6 @@ def search_all():
# @login_required
def index_search():
req_dict = request.get_json()
key_word = req_dict.get("key_word") # 关键字
carrier_type = req_dict.get("carrier_type") # 载体类型 1地块，2楼宇，3厂房，4园区，5项目
carrier_name = req_dict.get("carrier_name") # 载体名称
district = req_dict.get("district") # 所属区县
......@@ -101,17 +99,19 @@ def index_search():
total_num = ''
try:
if carrier_type == 1:
if key_word:
if carrier_name:
land_obj = CarrierLand.query.filter(
CarrierLand.land_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
# CarrierLand.land_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierLand.land_nature == nature if nature else text(''),
CarrierLand.total_area > float(area[0]) if area[0] else text(''),
CarrierLand.total_area <= float(area[1]) if area[1] else text(''),
).filter(
or_(
CarrierLand.land_name.like('%{}%'.format(key_word)) if key_word else text(''),
CarrierLand.land_nature.like('%{}%'.format(key_word)) if key_word else text(''),
CarrierLand.total_area.like('%{}%'.format(key_word)) if key_word else text('')
CarrierLand.land_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierLand.land_nature.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierLand.total_area.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierLand.district.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierLand.total_area.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
))
else:
land_obj = CarrierLand.query.filter(
......@@ -133,9 +133,9 @@ def index_search():
} for land_obj in land_obj_list]
if carrier_type == 2:
if key_word:
if carrier_name:
build_obj = CarrierBuild.query.filter(
CarrierBuild.build_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
# CarrierBuild.build_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierBuild.attract_status == industry if industry else text(''),
CarrierBuild.build_area > build_area[0] if build_area[0] else text(''),
CarrierBuild.build_area <= build_area[1] if build_area[1] else text(''),
......@@ -144,9 +144,12 @@ def index_search():
).filter(
or_(
CarrierBuild.build_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierBuild.attract_status.like('%{}%'.format(key_word)) if key_word else text(''),
CarrierBuild.build_area.like('%{}%'.format(key_word)) if key_word else text(''),
CarrierBuild.rent_money.like('%{}%'.format(key_word)) if key_word else text('')
CarrierBuild.attract_status.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierBuild.build_area.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierBuild.rent_money.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierBuild.district_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierBuild.build_area.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
))
else:
build_obj = CarrierBuild.query.filter(
......@@ -171,17 +174,19 @@ def index_search():
} for build_obj in build_obj_list]
if carrier_type == 3:
if key_word:
if carrier_name:
factory_obj = CarrierFactory.query.filter(
CarrierFactory.factory_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
# CarrierFactory.factory_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierFactory.attract_status == industry if industry else text(''),
CarrierFactory.factory_area > build_area[0] if build_area[0] else text(''),
CarrierFactory.factory_area <= build_area[1] if build_area[1] else text('')
).filter(
or_(
CarrierFactory.factory_name.like('%{}%'.format(key_word)) if key_word else text(''),
CarrierFactory.attract_status.like('%{}%'.format(key_word)) if key_word else text(''),
CarrierFactory.factory_area.like('%{}%'.format(key_word)) if key_word else text(''),
CarrierFactory.factory_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierFactory.attract_status.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierFactory.factory_area.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
CarrierFactory.district_name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
))
else:
factory_obj = CarrierFactory.query.filter(
......@@ -203,16 +208,20 @@ def index_search():
} for factory_obj in factory_obj_list]
if carrier_type == 4: # 园区
if key_word:
if carrier_name:
zone_obj = Induzone.query.filter(
Induzone.name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
# Induzone.name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Induzone.navigat == industry if industry else text(''),
Induzone.level == zone_level if zone_level else text('')
).filter(
or_(
Induzone.name.like('%{}%'.format(key_word)) if key_word else text(''),
Induzone.navigat.like('%{}%'.format(key_word)) if key_word else text(''),
Induzone.level.like('%{}%'.format(key_word)) if key_word else text(''),
Induzone.name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Induzone.navigat.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Induzone.level.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Induzone.phone.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Induzone.industry_position.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Induzone.district.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
))
else:
zone_obj = Induzone.query.filter(
......@@ -233,19 +242,19 @@ def index_search():
} for zone_obj in zone_obj_list]
if carrier_type == 5: # 项目
if key_word:
if carrier_name:
project_obj = Project.query.filter(
Project.name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
# Project.name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Project.district == district if district else text(''),
Project.attract_industry == industry if industry else text(''),
Project.money > float(investment_volume_list[0]) * 10000 if investment_volume_list[0] else text(''),
Project.money <= float(investment_volume_list[1]) * 10000 if investment_volume_list[1] else text(''),
).filter(
or_(
Project.name.like('%{}%'.format(key_word)) if key_word else text(''),
Project.district.like('%{}%'.format(key_word)) if key_word else text(''),
Project.attract_industry.like('%{}%'.format(key_word)) if key_word else text(''),
Project.money.like('%{}%'.format(key_word)) if key_word else text('')
Project.name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Project.district.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Project.attract_industry.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Project.money.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
))
else:
project_obj = Project.query.filter(
......
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