Skip to content

M
mancheng
Commit 8b9d0ed0 by dong
Options

fix20230721

parent 80a6218a
Showing with 37 additions and 14 deletions
apps/view_choose/choose_view.py
...@@ -100,19 +100,27 @@ def global_region(industry_id, preference, key_words, district_name, page, per_p ...@@ -100,19 +100,27 @@ def global_region(industry_id, preference, key_words, district_name, page, per_p
# 土地公共方法 # 土地公共方法
def global_land(key_words, district_name, land_name, land_nature, industry_name, page, per_page): def global_land(key_words, district_name, land_name, land_nature, industry_name, page, per_page):
try: try:
if key_words:
carrier_obj = CarrierLand.query.filter( carrier_obj = CarrierLand.query.filter(
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.industry_name.like('%{}%'.format(industry_name)) if industry_name else text(''),
CarrierLand.audit_status == 1 CarrierLand.audit_status == 1
) )).filter(
if key_words:
carrier_obj = carrier_obj.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 + "%")
)) ))
else:
carrier_obj = CarrierLand.query.filter(
CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' 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
)
land_obj_list = carrier_obj.order_by(CarrierLand.upload_time.desc()).paginate(page, per_page).items land_obj_list = carrier_obj.order_by(CarrierLand.upload_time.desc()).paginate(page, per_page).items
carrier_size = len(land_obj_list) carrier_size = len(land_obj_list)
...@@ -143,19 +151,27 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name, ...@@ -143,19 +151,27 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name,
# 厂房公共方法 # 厂房公共方法
def global_factory(key_words, district_name, factory_name, industry_name, page, per_page): def global_factory(key_words, district_name, factory_name, industry_name, page, per_page):
try: try:
if key_words:
carrier_obj = CarrierFactory.query.filter( carrier_obj = CarrierFactory.query.filter(
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(''),
CarrierFactory.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(
if key_words: or_(CarrierFactory.attract_status.like("%" + key_words + "%"),
carrier_obj = carrier_obj.filter(or_(CarrierFactory.attract_status.like("%" + key_words + "%"),
CarrierFactory.district_name.like("%" + key_words + "%"), CarrierFactory.district_name.like("%" + key_words + "%"),
CarrierFactory.factory_name.like("%" + key_words + "%") CarrierFactory.factory_name.like("%" + key_words + "%")
)) ))
carrier_size = carrier_obj.count() carrier_size = carrier_obj.count()
else:
carrier_obj = CarrierFactory.query.filter(
CarrierFactory.factory_name.like('%{}%'.format(factory_name)) if factory_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.audit_status == 1
)
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:
data_list = [{ data_list = [{
...@@ -187,20 +203,27 @@ def global_factory(key_words, district_name, factory_name, industry_name, page, ...@@ -187,20 +203,27 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
# 楼宇公共方法 # 楼宇公共方法
def global_build(key_words, district_name, build_name, industry_name, build_type, page, per_page): def global_build(key_words, district_name, build_name, industry_name, build_type, page, per_page):
try: try:
if key_words:
carrier_obj = CarrierBuild.query.filter( carrier_obj = CarrierBuild.query.filter(
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(''),
CarrierBuild.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
) )).filter(
if key_words:
carrier_obj = carrier_obj.filter(
or_(CarrierBuild.attract_status.like("%" + key_words + "%"), or_(CarrierBuild.attract_status.like("%" + key_words + "%"),
CarrierBuild.district_name.like("%" + key_words + "%"), CarrierBuild.district_name.like("%" + key_words + "%"),
CarrierBuild.build_name.like("%" + key_words + "%"), CarrierBuild.build_name.like("%" + key_words + "%"),
CarrierBuild.build_type.like("%" + key_words + "%") CarrierBuild.build_type.like("%" + key_words + "%")
)) ))
else:
carrier_obj = CarrierBuild.query.filter(
CarrierBuild.build_name.like('%{}%'.format(build_name)) if build_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.attract_status.like('%{}%'.format(industry_name)) if industry_name else text(''),
CarrierBuild.audit_status == 1
)
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
carrier_size = len(build_obj_list) carrier_size = len(build_obj_list)
......
apps/view_user/view.py
...@@ -226,8 +226,8 @@ def login_bypwd(): ...@@ -226,8 +226,8 @@ def login_bypwd():
# 参数获取与校验 # 参数获取与校验
req_dict = request.get_json() req_dict = request.get_json()
# 解密 # 解密
param = req_dict.get("param") # 加密参数 # param = req_dict.get("param") # 加密参数
req_dict = json.loads(decrypt(param)) # req_dict = json.loads(decrypt(param))
mobile = req_dict.get('mobile') mobile = req_dict.get('mobile')
password = req_dict.get('password') password = req_dict.get('password')
# 校验参数完整性 # 校验参数完整性
......
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