fix20221210

apps/view_choose/view.py

@@ -42,6 +42,9 @@ def default_address():
                           "charge": i.charge if i.charge else "-",  # 园区负责人
                           "charge": i.charge if i.charge else "-",  # 园区负责人
                           "phone": i.phone if i.phone else "-",  # 园区电话
                           "phone": i.phone if i.phone else "-",  # 园区电话
                           "address": i.address,  # 园区地址
                           "address": i.address,  # 园区地址
+                          "gdp": i.gdp,
+                          "area": i.area,
+                          "navigat": i.navigat,
                           # "address": i.region,  # 园区地址
                           # "address": i.region,  # 园区地址
                           "jwd": {"lng": i.lng, "lat": i.lat}} for i in result], "all_jwd": all_jwd, "size": size}
                           "jwd": {"lng": i.lng, "lat": i.lat}} for i in result], "all_jwd": all_jwd, "size": size}
         if not result:
         if not result:
@@ -79,9 +82,13 @@ def advice():
         # 根据产业名称查询园区
         # 根据产业名称查询园区
         # zone = Induzone.query.filter(or_(Induzone.navigat.like("%{}%".format(industry_name)),
         # zone = Induzone.query.filter(or_(Induzone.navigat.like("%{}%".format(industry_name)),
         #                                  Induzone.navigator.like("%{}%".format(industry_name))))
         #                                  Induzone.navigator.like("%{}%".format(industry_name))))
-        zone = Induzone.query.filter(Induzone.district == 'address')
+        zone = Induzone.query.filter(
+            Induzone.district == address if address else text("")
+        )
 
 
         print(zone.all())
         print(zone.all())
+        if product:
+            zone = zone.filter(Induzone.navigat.like('%{}%'.format(product)))
         # 根据投资预算过滤
         # 根据投资预算过滤
         if budget:
         if budget:
             zone = zone.filter(Induzone.invest_power < float(budget))
             zone = zone.filter(Induzone.invest_power < float(budget))