Skip to content

M
mancheng
Commit 7a7ce119 by dong
Options

fix20230406

parent 90ad5e60
Showing with 108 additions and 68 deletions
apps/view_xiaocx/view.py
...@@ -859,92 +859,132 @@ def collection_list(): ...@@ -859,92 +859,132 @@ def collection_list():
if name == 'land': if name == 'land':
obj_list = UserLand.query.filter(UserLand.user_id == user_id).order_by(UserLand.create_time.desc()).all() obj_list = UserLand.query.filter(UserLand.user_id == user_id).order_by(UserLand.create_time.desc()).all()
# obj_list = user_obj.carrier_land # obj_list = user_obj.carrier_land
data = [{ id_list = [obj.land_id for obj in obj_list]
"id": obj.id, data = []
"name": obj.land_name, for id in id_list:
"district": obj.district_name, obj = CarrierLand.query.get(id)
"nature": obj.land_nature, data = {
"area": obj.total_area, "id": obj.id,
"price_url": obj.price_url, "name": obj.land_name,
"lng": obj.lng, "district": obj.district_name,
"lat": obj.lat, "nature": obj.land_nature,
} for obj in obj_list] "area": obj.total_area,
"price_url": obj.price_url,
"lng": obj.lng,
"lat": obj.lat,
}
elif name == 'build': elif name == 'build':
obj_list = UserBuild.query.filter(UserBuild.user_id == user_id).order_by(UserBuild.create_time.desc()).all() obj_list = UserBuild.query.filter(UserBuild.user_id == user_id).order_by(UserBuild.create_time.desc()).all()
# obj_list = user_obj.carrier_build # obj_list = user_obj.carrier_build
data = [{ id_list = [obj.build_id for obj in obj_list]
"id": obj.id, data = []
"name": obj.build_name, for id in id_list:
"district": obj.district_name, obj = CarrierBuild.query.get(id)
"rent": obj.rent_money, data_dic = {
"area": obj.build_area, "id": obj.id,
"price_url": obj.price_url, "name": obj.build_name,
"lng": obj.lng, "district": obj.district_name,
"lat": obj.lat, "rent": obj.rent_money,
} for obj in obj_list] "area": obj.build_area,
"price_url": obj.price_url,
"lng": obj.lng,
"lat": obj.lat,
}
data.append(data_dic)
elif name == 'factory': elif name == 'factory':
obj_list = UserFactory.query.filter(UserFactory.user_id == user_id).order_by(UserFactory.create_time.desc()).all() obj_list = UserFactory.query.filter(UserFactory.user_id == user_id).order_by(UserFactory.create_time.desc()).all()
# obj_list = user_obj.carrier_factory # obj_list = user_obj.carrier_factory
data = [{ id_list = [obj.factory_id for obj in obj_list]
"id": obj.id, data = []
"name": obj.factory_name, for id in id_list:
"district": obj.district_name, obj = CarrierFactory.query.get(id)
"attract_industry": obj.attract_status, data_dic = {
"area": obj.factory_area, "id": obj.id,
"price_url": obj.price_url, "name": obj.factory_name,
"lng": obj.lng, "district": obj.district_name,
"lat": obj.lat, "attract_industry": obj.attract_status,
} for obj in obj_list] "area": obj.factory_area,
"price_url": obj.price_url,
"lng": obj.lng,
"lat": obj.lat,
}
data.append(data_dic)
elif name == 'zone': elif name == 'zone':
obj_list = UserZone.query.filter(UserZone.user_id == user_id).order_by(UserZone.create_time.desc()).all() obj_list = UserZone.query.filter(UserZone.user_id == user_id).order_by(UserZone.create_time.desc()).all()
# obj_list = user_obj.industry_zone # obj_list = user_obj.industry_zone
data = [{ id_list = [obj.zone_id for obj in obj_list]
"id": obj.id, data = []
"name": obj.name, for id in id_list:
"phone": obj.phone, obj = Induzone.query.get(id)
"industry_position": obj.industry_position, data_dic = {
"district": obj.district, "id": obj.id,
"price_url": obj.image, "name": obj.name,
"lng": obj.lng, "phone": obj.phone,
"lat": obj.lat, "industry_position": obj.industry_position,
} for obj in obj_list] "district": obj.district,
"price_url": obj.image,
"lng": obj.lng,
"lat": obj.lat,
}
data.append(data_dic)
elif name == 'project': elif name == 'project':
obj_list = UserProject.query.filter(UserProject.user_id == user_id).order_by(UserProject.create_time.desc()).all() obj_list = UserProject.query.filter(UserProject.user_id == user_id).order_by(UserProject.create_time.desc()).all()
# obj_list = user_obj.project # obj_list = user_obj.project
data = [{ id_list = [obj.project_id for obj in obj_list]
"id": obj.id, data = []
"name": obj.name, for id in id_list:
"district": obj.district, obj = Project.query.get(id)
"money": obj.money, data_dic = {
"attract_industry": obj.attract_industry, "id": obj.id,
# "lng": obj.lng, "name": obj.name,
# "lat": obj.lat, "district": obj.district,
} for obj in obj_list] "money": obj.money,
"attract_industry": obj.attract_industry,
# "lng": obj.lng,
# "lat": obj.lat,
}
data.append(data_dic)
elif name == 'company': elif name == 'company':
obj_list = UserCompany.query.filter(UserCompany.user_id == user_id).order_by(UserCompany.create_time.desc()).all() obj_list = UserCompany.query.filter(UserCompany.user_id == user_id).order_by(UserCompany.create_time.desc()).all()
# obj_list = user_obj.company # obj_list = user_obj.company
data = [{ id_list = [obj.company_id for obj in obj_list]
"id": obj.id, data = []
"company_name": obj.company_name, for id in id_list:
"district": obj.district, obj = Company.query.get(id)
"company_industry": obj.company_industry, data_dic = {
"lng": obj.lng, "id": obj.id,
"lat": obj.lat, "company_name": obj.company_name,
"create_time": obj.create_time, "district": obj.district,
} for obj in obj_list] "company_industry": obj.company_industry,
"lng": obj.lng,
"lat": obj.lat,
}
data.append(data_dic)
elif name == 'policy': elif name == 'policy':
obj_list = user_obj.industry_policy obj_list = UserPolicy.query.filter(UserPolicy.user_id == user_id).order_by(UserPolicy.create_time.desc()).all()
data = [{ # obj_list = user_obj.industry_policy
"id": obj.id, id_list = [obj.policy_id for obj in obj_list]
"name": obj.name, data = []
"post_num": obj.post_num, for id in id_list:
"industry": obj.industry, obj = InduPolicy.query.get(id)
"pubdate": obj.pubdate.strftime("%Y-%m-%d"), data_dic = {
"file": obj.file "id": obj.id,
} for obj in obj_list] "name": obj.name,
"post_num": obj.post_num,
"industry": obj.industry,
"pubdate": obj.pubdate.strftime("%Y-%m-%d"),
"file": obj.file
}
data.append(data_dic)
else: else:
pass pass
data = sorted(data, key=lambda x: x['id'], reverse=True) # data = sorted(data, key=lambda x: x['id'], reverse=True)
return jsonify(code=RET.OK, data=data, msg='Query success') return jsonify(code=RET.OK, data=data, msg='Query success')
except Exception as e: except Exception as e:
......
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