Skip to content

M
mancheng
Commit cdc1b83d by dong
Options

fix20230721

parent 9dc99a65
Showing with 4 additions and 6 deletions
apps/view_choose/choose_view.py
...@@ -105,11 +105,9 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name, ...@@ -105,11 +105,9 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name,
and_(CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''), and_(CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierLand.district_name == district_name if district_name != '晋城市' else text(''),
CarrierLand.land_nature.like('%{}%'.format(land_nature)) if land_nature else text(''), CarrierLand.land_nature.like('%{}%'.format(land_nature)) if land_nature else text(''),
# CarrierLand.industry_name.like('%{}%'.format(industry_name)) if industry_name else text(''),
CarrierLand.audit_status == 1 CarrierLand.audit_status == 1
)).filter( )).filter(
or_( or_(
# CarrierLand.industry_name.like("%" + key_words + "%"),
CarrierLand.district_name.like("%" + key_words + "%"), CarrierLand.district_name.like("%" + key_words + "%"),
CarrierLand.land_name.like("%" + key_words + "%") CarrierLand.land_name.like("%" + key_words + "%")
)) ))
...@@ -118,7 +116,6 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name, ...@@ -118,7 +116,6 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name,
CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''), CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierLand.district_name == district_name if district_name != '晋城市' else text(''),
CarrierLand.land_nature == land_nature if land_nature else text(''), CarrierLand.land_nature == land_nature if land_nature else text(''),
# CarrierLand.industry_name.like('%{}%'.format(industry_name)) if industry_name else text(''),
CarrierLand.audit_status == 1 CarrierLand.audit_status == 1
) )
...@@ -375,8 +372,9 @@ def search_all(): ...@@ -375,8 +372,9 @@ def search_all():
page, per_page) page, per_page)
data_list.append(region_data) data_list.append(region_data)
# 土地 # 土地
land_data = global_land(key_words, district_name, '', '', '', page, per_page) if not industry_name:
data_list.append(land_data) land_data = global_land(key_words, district_name, '', '', '', page, per_page)
data_list.append(land_data)
# 厂房 # 厂房
factory_data = global_factory(key_words, district_name, '', industry_name, page, per_page) factory_data = global_factory(key_words, district_name, '', industry_name, page, per_page)
data_list.append(factory_data) data_list.append(factory_data)
...@@ -384,7 +382,7 @@ def search_all(): ...@@ -384,7 +382,7 @@ def search_all():
build_data = global_build(key_words, district_name, '', industry_name, '', page, per_page) build_data = global_build(key_words, district_name, '', industry_name, '', page, per_page)
data_list.append(build_data) data_list.append(build_data)
return jsonify(code=RET.OK, data=data_list, msg='全部数据查询成功！') return jsonify(code=RET.OK, data=data_list, msg='全部数据查询成功！')
if carrier_type_id == 1: # 土地 if carrier_type_id == 1 and not industry_name: # 土地
data = global_land(key_words, district_name, '', '', '', page, per_page) data = global_land(key_words, district_name, '', '', '', page, per_page)
return jsonify(data) return jsonify(data)
if carrier_type_id == 2: # 厂房 if carrier_type_id == 2: # 厂房
......
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