Commit 9627c9a6 by dong

fix

parent 4e346a19
......@@ -1217,6 +1217,8 @@ def radar_enums():
enterprise = enterprise.filter_by(district=district)
size = []
company = []
if product:
# 有可能会变成模糊查询
# enterprise = enterprise.filter(or_(
......@@ -1224,7 +1226,6 @@ def radar_enums():
# Enterprise.product_all1.like("%{}%".format(product)),
# Enterprise.product_all2.like("%{}%".format(product))
# ))
company = []
# indu_obj_li = get_product_li(product, inid)
# for indu_name in indu_obj_li:
......@@ -1255,23 +1256,23 @@ def radar_enums():
# for indu_name in indu_obj_li:
# indu_name = indu_obj.industry_name
# print("正在查询【{}】的相关企业......".format(indu_name))
indu_obj = Industry.query.get(inid)
indu_name = indu_obj.name
# indu_obj = Industry.query.get(inid)
# indu_name = indu_obj.name
company1 = Enterprise.query.filter(
Enterprise.c_type == inid,
Enterprise.product_all.like("%{}%".format(indu_name))
Enterprise.product_all.like("%{}%".format(product))
).all()
company += company1
# print(company1)
company2 = Enterprise.query.filter(
Enterprise.c_type1 == inid,
Enterprise.product_all1.like("%{}%".format(indu_name))
Enterprise.product_all1.like("%{}%".format(product))
).all()
company += company2
# print(company2)
company3 = Enterprise.query.filter(
Enterprise.c_type2 == inid,
Enterprise.product_all2.like("%{}%".format(indu_name))
Enterprise.product_all2.like("%{}%".format(product))
).all()
company += company3
......@@ -1534,23 +1535,23 @@ def newList1():
# company += company3
# company = set(company)
indu_obj = Industry.query.get(inid)
indu_name = indu_obj.name
# indu_obj = Industry.query.get(inid)
# indu_name = indu_obj.name
company1 = Enterprise.query.filter(
Enterprise.c_type == inid,
Enterprise.product_all.like("%{}%".format(indu_name))
Enterprise.product_all.like("%{}%".format(product))
).all()
company += company1
# print(company1)
company2 = Enterprise.query.filter(
Enterprise.c_type1 == inid,
Enterprise.product_all1.like("%{}%".format(indu_name))
Enterprise.product_all1.like("%{}%".format(product))
).all()
company += company2
# print(company2)
company3 = Enterprise.query.filter(
Enterprise.c_type2 == inid,
Enterprise.product_all2.like("%{}%".format(indu_name))
Enterprise.product_all2.like("%{}%".format(product))
).all()
company += company3
company = set(company)
......
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