Commit ff36c436 by dong

fix20221208

parent ec3d4ea3
...@@ -141,7 +141,7 @@ def industry_resource(): ...@@ -141,7 +141,7 @@ def industry_resource():
'''创新资源机构列表''' '''创新资源机构列表'''
req_dict = request.get_json() req_dict = request.get_json()
inid = req_dict.get("inid") # 行业id inid = req_dict.get("inid") # 行业id
industry_level = req_dict.get("industry_level") # 行业等级,(父行业高端设备等五个为"1",子行业为"2") industry_level = req_dict.get("industry_level") # 行业等级,(父行业高端设备等五个"1",子行业"2")
select_flag = req_dict.get("select_flag") # 机构类型id. 高等院校1,科研机构2,创新平台3,产业服务平台4 select_flag = req_dict.get("select_flag") # 机构类型id. 高等院校1,科研机构2,创新平台3,产业服务平台4
...@@ -334,9 +334,9 @@ def industry_zaiti(): ...@@ -334,9 +334,9 @@ def industry_zaiti():
'''产业载体数据''' '''产业载体数据'''
req_dict = request.get_json() req_dict = request.get_json()
inid = req_dict.get("inid") # 行业id inid = req_dict.get("inid") # 行业id
industry_level = req_dict.get("industry_level") # 行业等级,(父行业高端设备等五个为"1",子行业为"2") industry_level = req_dict.get("industry_level") # 行业等级,(父行业高端设备等五个"1",子行业"2")
select_flag = req_dict.get("select_flag") # 1为行政区,2为园区,3为产业载体, select_flag = req_dict.get("select_flag") # 1行政区,2园区,3产业载体,
# 4为土地,5为楼宇,6为厂房,7为开发区 # 4土地,5楼宇,6厂房,7开发区
page = req_dict.get("page") # 分页页码 page = req_dict.get("page") # 分页页码
perpage = req_dict.get("perpage") # 分页大小 perpage = req_dict.get("perpage") # 分页大小
...@@ -359,8 +359,8 @@ def industry_policy(): ...@@ -359,8 +359,8 @@ def industry_policy():
"""产业政策数据""" """产业政策数据"""
req_dict = request.get_json() req_dict = request.get_json()
inid = req_dict.get("inid") # 行业id inid = req_dict.get("inid") # 行业id
industry_level = req_dict.get("industry_level") # 行业等级,(父行业高端设备等五个为1,子行业为2) industry_level = req_dict.get("industry_level") # 行业等级,(父行业高端设备等五个1,子行业2)
policy_level = req_dict.get("policy_level") # 政策等级,(国家级为1,省级为2,市级为3,区县为4,开发区为5) policy_level = req_dict.get("policy_level") # 政策等级,(国家级1,省级2,市级3,区县4,开发区5)
page = req_dict.get("page") # 分页页码 page = req_dict.get("page") # 分页页码
perpage = req_dict.get("perpage") # 分页大小 perpage = req_dict.get("perpage") # 分页大小
...@@ -605,7 +605,7 @@ def get_lab_detail(): ...@@ -605,7 +605,7 @@ def get_lab_detail():
def get_zaiti_detail_data(): def get_zaiti_detail_data():
req_dict = request.get_json() req_dict = request.get_json()
id = req_dict.get('id') id = req_dict.get('id')
cate_id = req_dict.get('cate_id') # 1为行政区,2为园区,3为土地,4为楼宇,5为厂房 cate_id = req_dict.get('cate_id') # 1行政区,2园区,3土地,4楼宇,5厂房
print(cate_id) print(cate_id)
if cate_id in [1, 2]: if cate_id in [1, 2]:
...@@ -710,7 +710,7 @@ def get_zaiti_detail_data(): ...@@ -710,7 +710,7 @@ def get_zaiti_detail_data():
current_app.logger.error(e) current_app.logger.error(e)
"""以下202212月改版后需求""" """以下202212月改版后需求"""
# 企业搜索 # 企业搜索
...@@ -730,14 +730,14 @@ def search_enterprise(): ...@@ -730,14 +730,14 @@ def search_enterprise():
Company.entype == entype, Company.entype == entype,
Company.company_name.like('%{}%'.format(company_name)), Company.company_name.like('%{}%'.format(company_name)),
Company.status == status, Company.status == status,
Company.high_new == '1' if aptitude == '是否高新技术企业' else text(''), Company.high_new == '1' if aptitude == '高新技术企业' else text(''),
Company.tbe == '1' if aptitude == '是否科技型中小企业' else text(''), Company.tbe == '1' if aptitude == '科技型中小企业' else text(''),
Company.quoted_company == '1' if aptitude == '是否上市企业' else text(''), Company.quoted_company == '1' if aptitude == '上市企业' else text(''),
Company.sxmon == '1' if aptitude == '是否山西民营100强' else text(''), Company.sxmon == '1' if aptitude == '山西民营100强' else text(''),
Company.zjtg == '1' if aptitude == '是否为山西专精特新企业' else text(''), Company.zjtg == '1' if aptitude == '山西专精特新企业' else text(''),
Company.unicorn == '1' if aptitude == '独角兽企业' else text(''), Company.unicorn == '1' if aptitude == '独角兽企业' else text(''),
Company.dengl == '1' if aptitude == '瞪羚' else text(''), Company.dengl == '1' if aptitude == '瞪羚' else text(''),
Company.isfive == '1' if aptitude == '是否中国500强' else text(''), Company.isfive == '1' if aptitude == '中国500强' else text(''),
Company.scale == '1' if aptitude == '规模以上企业' else text(''), Company.scale == '1' if aptitude == '规模以上企业' else text(''),
Company.serve == '1' if aptitude == '限额以上服务业' else text(''), Company.serve == '1' if aptitude == '限额以上服务业' else text(''),
)) ))
...@@ -747,14 +747,14 @@ def search_enterprise(): ...@@ -747,14 +747,14 @@ def search_enterprise():
"company_name": company_obj.company_name, "company_name": company_obj.company_name,
"district": company_obj.district, "district": company_obj.district,
"entype": company_obj.entype, "entype": company_obj.entype,
"aptitude": ["是否高新技术企业" if company_obj.high_new == '1' else "aptitude": ["高新技术企业" if company_obj.high_new == '1' else
"是否科技型中小企业" if company_obj.tbe == '1' else "科技型中小企业" if company_obj.tbe == '1' else
"是否上市企业" if company_obj.quoted_company == '1' else "上市企业" if company_obj.quoted_company == '1' else
"是否山西民营100强" if company_obj.sxmon == '1' else "山西民营100强" if company_obj.sxmon == '1' else
"是否为山西专精特新企业" if company_obj.zjtg == '1' else "山西专精特新企业" if company_obj.zjtg == '1' else
"独角兽企业" if company_obj.unicorn == '1' else "独角兽企业" if company_obj.unicorn == '1' else
"瞪羚" if company_obj.dengl == '1' else "瞪羚" if company_obj.dengl == '1' else
"是否中国500强" if company_obj.isfive == '1' else "中国500强" if company_obj.isfive == '1' else
"规模以上企业" if company_obj.scale == '1' else "规模以上企业" if company_obj.scale == '1' else
"限额以上服务业" if company_obj.serve == '1' else ''] "限额以上服务业" if company_obj.serve == '1' else '']
} for company_obj in company_obj_list] } for company_obj in company_obj_list]
...@@ -771,7 +771,7 @@ def industry_enterprise(): ...@@ -771,7 +771,7 @@ def industry_enterprise():
'''骨干企业数据''' '''骨干企业数据'''
req_dict = request.get_json() req_dict = request.get_json()
inid = req_dict.get("inid") # 行业id inid = req_dict.get("inid") # 行业id
industry_level = req_dict.get("industry_level") # 行业等级,(父行个为"1",子行业为"2") industry_level = req_dict.get("industry_level") # 行业等级,(父行个"1",子行业"2")
product = req_dict.get("product") product = req_dict.get("product")
page = req_dict.get("page") # 分页页码 page = req_dict.get("page") # 分页页码
perpage = req_dict.get("per_page") # 分页大小 perpage = req_dict.get("per_page") # 分页大小
...@@ -802,7 +802,7 @@ def industry_enterprise(): ...@@ -802,7 +802,7 @@ def industry_enterprise():
Company.tbe == '1' if aptitude == '科技型中小企业' else text(''), Company.tbe == '1' if aptitude == '科技型中小企业' else text(''),
Company.quoted_company == '1' if aptitude == '上市企业' else text(''), Company.quoted_company == '1' if aptitude == '上市企业' else text(''),
Company.sxmon == '1' if aptitude == '山西民营100强' else text(''), Company.sxmon == '1' if aptitude == '山西民营100强' else text(''),
Company.zjtg == '1' if aptitude == '山西专精特新企业' else text(''), Company.zjtg == '1' if aptitude == '山西专精特新企业' else text(''),
Company.unicorn == '1' if aptitude == '独角兽企业' else text(''), Company.unicorn == '1' if aptitude == '独角兽企业' else text(''),
Company.dengl == '1' if aptitude == '瞪羚' else text(''), Company.dengl == '1' if aptitude == '瞪羚' else text(''),
Company.isfive == '1' if aptitude == '中国500强' else text(''), Company.isfive == '1' if aptitude == '中国500强' else text(''),
...@@ -826,7 +826,7 @@ def industry_enterprise(): ...@@ -826,7 +826,7 @@ def industry_enterprise():
"tbe": '科技型中小企业' if i.tbe == '1' else '', "tbe": '科技型中小企业' if i.tbe == '1' else '',
"quoted_company": '上市企业' if i.quoted_company == '1' else '', "quoted_company": '上市企业' if i.quoted_company == '1' else '',
"sxmon": '山西民营100强' if i.sxmon == '1' else '', "sxmon": '山西民营100强' if i.sxmon == '1' else '',
"zjtg": '山西专精特新企业' if i.zjtg == '1' else '', "zjtg": '山西专精特新企业' if i.zjtg == '1' else '',
"unicorn": '独角兽企业' if i.unicorn == '1' else '', "unicorn": '独角兽企业' if i.unicorn == '1' else '',
"dengl": '瞪羚' if i.dengl == '1' else '', "dengl": '瞪羚' if i.dengl == '1' else '',
"isfive": '中国500强' if i.isfive == '1' else '', "isfive": '中国500强' if i.isfive == '1' else '',
......
...@@ -103,7 +103,7 @@ def attract_map(): ...@@ -103,7 +103,7 @@ def attract_map():
return jsonify(code=RET.DBERR, msg="数据库查询错误") return jsonify(code=RET.DBERR, msg="数据库查询错误")
# 右侧全国地图企业数据 # 右侧全国地图企业数据
@api_map.route('/EnterpriseTop5', methods=['POST']) @api_map.route('/EnterpriseTop5', methods=['POST'])
# @login_required # @login_required
def attract_cnums(): def attract_cnums():
...@@ -198,14 +198,14 @@ def enterprise(): ...@@ -198,14 +198,14 @@ def enterprise():
df = [{"id": i.id, df = [{"id": i.id,
"company_name": i.company_name, "company_name": i.company_name,
"hots": i.hots, "hots": i.hots,
"aptitude": ['是否高新技术企业' if i.high_new == '1' else "aptitude": ['高新技术企业' if i.high_new == '1' else
'是否科技型中小企业' if i.tbe == '1' else '科技型中小企业' if i.tbe == '1' else
'是否上市企业' if i.quoted_company == '1' else '上市企业' if i.quoted_company == '1' else
'是否山西民营100强' if i.sxmon == '1' else '山西民营100强' if i.sxmon == '1' else
'是否为山西专精特新企业' if i.zjtg == '1' else '山西专精特新企业' if i.zjtg == '1' else
'独角兽企业' if i.unicorn == '1' else '独角兽企业' if i.unicorn == '1' else
'瞪羚' if i.dengl == '1' else '瞪羚' if i.dengl == '1' else
'是否中国500强' if i.isfive == '1' else '中国500强' if i.isfive == '1' else
'规模以上企业' if i.scale == '1' else '规模以上企业' if i.scale == '1' else
'限额以上服务业' if i.serve == '1' else ''] '限额以上服务业' if i.serve == '1' else '']
} for i in enterprise] } for i in enterprise]
...@@ -261,7 +261,7 @@ def attract_sdmap(): ...@@ -261,7 +261,7 @@ def attract_sdmap():
return jsonify(code=RET.OK, msg="获取成功", data=data) return jsonify(code=RET.OK, msg="获取成功", data=data)
"""以下202212月改版后需求新增""" """以下202212月改版后需求新增"""
# 企业搜索 # 企业搜索
...@@ -280,14 +280,14 @@ def search_enterprise(): ...@@ -280,14 +280,14 @@ def search_enterprise():
Enterprise.entype == entype, Enterprise.entype == entype,
Enterprise.company_name.like('%{}%'.format(company_name)), Enterprise.company_name.like('%{}%'.format(company_name)),
Enterprise.status == status, Enterprise.status == status,
Enterprise.high_new == '1' if aptitude == '是否高新技术企业' else text(''), Enterprise.high_new == '1' if aptitude == '高新技术企业' else text(''),
Enterprise.tbe == '1' if aptitude == '是否科技型中小企业' else text(''), Enterprise.tbe == '1' if aptitude == '科技型中小企业' else text(''),
Enterprise.quoted_company == '1' if aptitude == '是否上市企业' else text(''), Enterprise.quoted_company == '1' if aptitude == '上市企业' else text(''),
Enterprise.sxmon == '1' if aptitude == '是否山西民营100强' else text(''), Enterprise.sxmon == '1' if aptitude == '山西民营100强' else text(''),
Enterprise.zjtg == '1' if aptitude == '是否为山西专精特新企业' else text(''), Enterprise.zjtg == '1' if aptitude == '山西专精特新企业' else text(''),
Enterprise.unicorn == '1' if aptitude == '独角兽企业' else text(''), Enterprise.unicorn == '1' if aptitude == '独角兽企业' else text(''),
Enterprise.dengl == '1' if aptitude == '瞪羚' else text(''), Enterprise.dengl == '1' if aptitude == '瞪羚' else text(''),
Enterprise.isfive == '1' if aptitude == '是否中国500强' else text(''), Enterprise.isfive == '1' if aptitude == '中国500强' else text(''),
Enterprise.scale == '1' if aptitude == '规模以上企业' else text(''), Enterprise.scale == '1' if aptitude == '规模以上企业' else text(''),
Enterprise.serve == '1' if aptitude == '限额以上服务业' else text(''), Enterprise.serve == '1' if aptitude == '限额以上服务业' else text(''),
)) ))
...@@ -299,14 +299,14 @@ def search_enterprise(): ...@@ -299,14 +299,14 @@ def search_enterprise():
"enterprise_name": enterprise_obj.enterprise_name, "enterprise_name": enterprise_obj.enterprise_name,
"district": enterprise_obj.district, "district": enterprise_obj.district,
"entype": enterprise_obj.entype, "entype": enterprise_obj.entype,
"aptitude": ["是否高新技术企业" if enterprise_obj.high_new == '1' else "aptitude": ["高新技术企业" if enterprise_obj.high_new == '1' else
"是否科技型中小企业" if enterprise_obj.tbe == '1' else "科技型中小企业" if enterprise_obj.tbe == '1' else
"是否上市企业" if enterprise_obj.quoted_company == '1' else "上市企业" if enterprise_obj.quoted_company == '1' else
"是否山西民营100强" if enterprise_obj.sxmon == '1' else "山西民营100强" if enterprise_obj.sxmon == '1' else
"是否为山西专精特新企业" if enterprise_obj.zjtg == '1' else "山西专精特新企业" if enterprise_obj.zjtg == '1' else
"独角兽企业" if enterprise_obj.unicorn == '1' else "独角兽企业" if enterprise_obj.unicorn == '1' else
"瞪羚" if enterprise_obj.dengl == '1' else "瞪羚" if enterprise_obj.dengl == '1' else
"是否中国500强" if enterprise_obj.isfive == '1' else "中国500强" if enterprise_obj.isfive == '1' else
"规模以上企业" if enterprise_obj.scale == '1' else "规模以上企业" if enterprise_obj.scale == '1' else
"限额以上服务业" if enterprise_obj.serve == '1' else ''] "限额以上服务业" if enterprise_obj.serve == '1' else '']
} for enterprise_obj in enterprise_obj_list] } for enterprise_obj in enterprise_obj_list]
......
...@@ -996,14 +996,14 @@ def search_enterprise(): ...@@ -996,14 +996,14 @@ def search_enterprise():
Enterprise.entype == entype, Enterprise.entype == entype,
Enterprise.company_name.like('%{}%'.format(company_name)), Enterprise.company_name.like('%{}%'.format(company_name)),
Enterprise.status == status, Enterprise.status == status,
Enterprise.high_new == '1' if aptitude == '是否高新技术企业' else text(''), Enterprise.high_new == '1' if aptitude == '高新技术企业' else text(''),
Enterprise.tbe == '1' if aptitude == '是否科技型中小企业' else text(''), Enterprise.tbe == '1' if aptitude == '科技型中小企业' else text(''),
Enterprise.quoted_company == '1' if aptitude == '是否上市企业' else text(''), Enterprise.quoted_company == '1' if aptitude == '上市企业' else text(''),
Enterprise.sxmon == '1' if aptitude == '是否山西民营100强' else text(''), Enterprise.sxmon == '1' if aptitude == '山西民营100强' else text(''),
Enterprise.zjtg == '1' if aptitude == '是否为山西专精特新企业' else text(''), Enterprise.zjtg == '1' if aptitude == '山西专精特新企业' else text(''),
Enterprise.unicorn == '1' if aptitude == '独角兽企业' else text(''), Enterprise.unicorn == '1' if aptitude == '独角兽企业' else text(''),
Enterprise.dengl == '1' if aptitude == '瞪羚' else text(''), Enterprise.dengl == '1' if aptitude == '瞪羚' else text(''),
Enterprise.isfive == '1' if aptitude == '是否中国500强' else text(''), Enterprise.isfive == '1' if aptitude == '中国500强' else text(''),
Enterprise.scale == '1' if aptitude == '规模以上企业' else text(''), Enterprise.scale == '1' if aptitude == '规模以上企业' else text(''),
Enterprise.serve == '1' if aptitude == '限额以上服务业' else text(''), Enterprise.serve == '1' if aptitude == '限额以上服务业' else text(''),
)) ))
...@@ -1015,14 +1015,14 @@ def search_enterprise(): ...@@ -1015,14 +1015,14 @@ def search_enterprise():
"enterprise_name": enterprise_obj.enterprise_name, "enterprise_name": enterprise_obj.enterprise_name,
"district": enterprise_obj.district, "district": enterprise_obj.district,
"entype": enterprise_obj.entype, "entype": enterprise_obj.entype,
"aptitude": ["是否高新技术企业" if enterprise_obj.high_new == '1' else "aptitude": ["高新技术企业" if enterprise_obj.high_new == '1' else
"是否科技型中小企业" if enterprise_obj.tbe == '1' else "科技型中小企业" if enterprise_obj.tbe == '1' else
"是否上市企业" if enterprise_obj.quoted_company == '1' else "上市企业" if enterprise_obj.quoted_company == '1' else
"是否山西民营100强" if enterprise_obj.sxmon == '1' else "山西民营100强" if enterprise_obj.sxmon == '1' else
"是否为山西专精特新企业" if enterprise_obj.zjtg == '1' else "山西专精特新企业" if enterprise_obj.zjtg == '1' else
"独角兽企业" if enterprise_obj.unicorn == '1' else "独角兽企业" if enterprise_obj.unicorn == '1' else
"瞪羚" if enterprise_obj.dengl == '1' else "瞪羚" if enterprise_obj.dengl == '1' else
"是否中国500强" if enterprise_obj.isfive == '1' else "中国500强" if enterprise_obj.isfive == '1' else
"规模以上企业" if enterprise_obj.scale == '1' else "规模以上企业" if enterprise_obj.scale == '1' else
"限额以上服务业" if enterprise_obj.serve == '1' else ''] "限额以上服务业" if enterprise_obj.serve == '1' else '']
} for enterprise_obj in enterprise_obj_list] } for enterprise_obj in enterprise_obj_list]
......
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