fix20230220

apps/view_choose/choose_view.py

@@ -104,10 +104,11 @@ 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(''),
                      CarrierLand.district_name == district_name if district_name != '晋城市' 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
                      )).filter(
-                or_(CarrierLand.industry_name.like("%" + key_words + "%"),
+                or_(
+                    # CarrierLand.industry_name.like("%" + key_words + "%"),
                     CarrierLand.district_name.like("%" + key_words + "%"),
                     CarrierLand.land_name.like("%" + key_words + "%")
                     ))
@@ -116,7 +117,7 @@ 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(''),
                      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.industry_name.like('%{}%'.format(industry_name)) if industry_name else text(''),
                      CarrierLand.audit_status == 1
                      ))
 
@@ -129,10 +130,10 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name,
                 "land_name": land_obj.land_name,
                 "land_nature": land_obj.land_nature,
                 "total_area": land_obj.total_area,
-                "jing_area": land_obj.jing_area,  # 审核信息
+                # "jing_area": land_obj.jing_area,  # 审核信息
                 "district_name": land_obj.district_name,
-                "industry_name": land_obj.industry_name,
-                "attract_status": land_obj.attract_status,
+                # "industry_name": land_obj.industry_name,
+                # "attract_status": land_obj.attract_status,
                 "lng": land_obj.lng,
                 "lat": land_obj.lat
             } for land_obj in land_obj_list]
@@ -181,7 +182,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
                 "factory_area": factory_obj.factory_area,
                 "district_name": factory_obj.district_name,  # 审核信息
                 "detail_address": factory_obj.detail_address,
-                "industry_name": factory_obj.industry_name,
+                "industry_name": factory_obj.attract_status,
                 "is_standard": factory_obj.is_standard,
                 "attract_status": factory_obj.attract_status,
                 "lng": factory_obj.lng,
@@ -233,7 +234,7 @@ def global_build(key_words, district_name, build_name, industry_name, build_type
                 "district_name": build_obj.district_name,
                 "build_name": build_obj.build_name,
                 "detail_address": build_obj.detail_address,  # 审核信息
-                "industry_name": build_obj.industry_name,
+                # "industry_name": build_obj.industry_name,
                 "layer_num": build_obj.layer_num,
                 "build_type": build_obj.build_type,
                 "attract_status": build_obj.attract_status,