Skip to content

M
mancheng
Commit 7a7ce119 by dong
Options

fix20230406

parent 90ad5e60
Showing with 57 additions and 17 deletions
apps/view_xiaocx/view.py
...@@ -859,7 +859,11 @@ def collection_list(): ...@@ -859,7 +859,11 @@ 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]
data = []
for id in id_list:
obj = CarrierLand.query.get(id)
data = {
"id": obj.id, "id": obj.id,
"name": obj.land_name, "name": obj.land_name,
"district": obj.district_name, "district": obj.district_name,
...@@ -868,11 +872,15 @@ def collection_list(): ...@@ -868,11 +872,15 @@ def collection_list():
"price_url": obj.price_url, "price_url": obj.price_url,
"lng": obj.lng, "lng": obj.lng,
"lat": obj.lat, "lat": obj.lat,
} for obj in obj_list] }
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]
data = []
for id in id_list:
obj = CarrierBuild.query.get(id)
data_dic = {
"id": obj.id, "id": obj.id,
"name": obj.build_name, "name": obj.build_name,
"district": obj.district_name, "district": obj.district_name,
...@@ -881,11 +889,17 @@ def collection_list(): ...@@ -881,11 +889,17 @@ def collection_list():
"price_url": obj.price_url, "price_url": obj.price_url,
"lng": obj.lng, "lng": obj.lng,
"lat": obj.lat, "lat": obj.lat,
} for obj in obj_list] }
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]
data = []
for id in id_list:
obj = CarrierFactory.query.get(id)
data_dic = {
"id": obj.id, "id": obj.id,
"name": obj.factory_name, "name": obj.factory_name,
"district": obj.district_name, "district": obj.district_name,
...@@ -894,11 +908,17 @@ def collection_list(): ...@@ -894,11 +908,17 @@ def collection_list():
"price_url": obj.price_url, "price_url": obj.price_url,
"lng": obj.lng, "lng": obj.lng,
"lat": obj.lat, "lat": obj.lat,
} for obj in obj_list] }
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]
data = []
for id in id_list:
obj = Induzone.query.get(id)
data_dic = {
"id": obj.id, "id": obj.id,
"name": obj.name, "name": obj.name,
"phone": obj.phone, "phone": obj.phone,
...@@ -907,11 +927,17 @@ def collection_list(): ...@@ -907,11 +927,17 @@ def collection_list():
"price_url": obj.image, "price_url": obj.image,
"lng": obj.lng, "lng": obj.lng,
"lat": obj.lat, "lat": obj.lat,
} for obj in obj_list] }
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]
data = []
for id in id_list:
obj = Project.query.get(id)
data_dic = {
"id": obj.id, "id": obj.id,
"name": obj.name, "name": obj.name,
"district": obj.district, "district": obj.district,
...@@ -919,32 +945,46 @@ def collection_list(): ...@@ -919,32 +945,46 @@ def collection_list():
"attract_industry": obj.attract_industry, "attract_industry": obj.attract_industry,
# "lng": obj.lng, # "lng": obj.lng,
# "lat": obj.lat, # "lat": obj.lat,
} for obj in obj_list] }
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]
data = []
for id in id_list:
obj = Company.query.get(id)
data_dic = {
"id": obj.id, "id": obj.id,
"company_name": obj.company_name, "company_name": obj.company_name,
"district": obj.district, "district": obj.district,
"company_industry": obj.company_industry, "company_industry": obj.company_industry,
"lng": obj.lng, "lng": obj.lng,
"lat": obj.lat, "lat": obj.lat,
"create_time": obj.create_time, }
} for obj in obj_list] 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_list = [obj.policy_id for obj in obj_list]
data = []
for id in id_list:
obj = InduPolicy.query.get(id)
data_dic = {
"id": obj.id, "id": obj.id,
"name": obj.name, "name": obj.name,
"post_num": obj.post_num, "post_num": obj.post_num,
"industry": obj.industry, "industry": obj.industry,
"pubdate": obj.pubdate.strftime("%Y-%m-%d"), "pubdate": obj.pubdate.strftime("%Y-%m-%d"),
"file": obj.file "file": obj.file
} for obj in obj_list] }
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