Skip to content

M
mancheng
Commit f26c5f9b by dong
Options

fix20230201

parent be668bd5
Showing with 4 additions and 4 deletions
apps/view_choose/choose_view.py
...@@ -125,7 +125,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page, ...@@ -125,7 +125,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
if key_words: if key_words:
carrier_obj = CarrierFactory.query.filter( carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)) if factory_name else text(''), and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)) if factory_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''),
CarrierFactory.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''), CarrierFactory.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
CarrierFactory.audit_status == 1 CarrierFactory.audit_status == 1
)).filter( )).filter(
...@@ -138,7 +138,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page, ...@@ -138,7 +138,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
else: else:
carrier_obj = CarrierFactory.query.filter( carrier_obj = CarrierFactory.query.filter(
and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)) if factory_name else text(''), and_(CarrierFactory.factory_name.like('%{}%'.format(factory_name)) if factory_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierFactory.district_name == district_name if district_name != '晋城市' else text(''),
CarrierFactory.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''), CarrierFactory.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
CarrierFactory.audit_status == 1 CarrierFactory.audit_status == 1
)) ))
...@@ -176,7 +176,7 @@ def global_build(key_words, district_name, build_name, industry_name, build_type ...@@ -176,7 +176,7 @@ def global_build(key_words, district_name, build_name, industry_name, build_type
if key_words: if key_words:
carrier_obj = CarrierBuild.query.filter( carrier_obj = CarrierBuild.query.filter(
and_(CarrierBuild.build_name.like('%{}%'.format(build_name)) if build_name else text(''), and_(CarrierBuild.build_name.like('%{}%'.format(build_name)) if build_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''),
CarrierBuild.build_type.like('%{}%'.format(build_type)) if build_type else text(''), CarrierBuild.build_type.like('%{}%'.format(build_type)) if build_type else text(''),
CarrierBuild.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''), CarrierBuild.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
CarrierBuild.audit_status == 1 CarrierBuild.audit_status == 1
...@@ -189,7 +189,7 @@ def global_build(key_words, district_name, build_name, industry_name, build_type ...@@ -189,7 +189,7 @@ def global_build(key_words, district_name, build_name, industry_name, build_type
else: else:
carrier_obj = CarrierBuild.query.filter( carrier_obj = CarrierBuild.query.filter(
and_(CarrierBuild.build_name.like('%{}%'.format(build_name)) if build_name else text(''), and_(CarrierBuild.build_name.like('%{}%'.format(build_name)) if build_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierBuild.district_name == district_name if district_name != '晋城市' else text(''),
CarrierBuild.build_type.like('%{}%'.format(build_type)) if build_type else text(''), CarrierBuild.build_type.like('%{}%'.format(build_type)) if build_type else text(''),
CarrierBuild.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''), CarrierBuild.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
CarrierBuild.audit_status == 1 CarrierBuild.audit_status == 1
......
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