Skip to content

M
mancheng
Commit 5ea94232 by dong
Options

fix20230226

parent 33ba6d71
Showing with 51 additions and 18 deletions
apps/inves_manage/statistic_analysis_view.py
......@@ -1380,18 +1380,22 @@ def areal_project():
def get_data():
req_dic = request.get_json()
flag = req_dic['flag']
current_year = str(datetime.now().year)
data_time = req_dic['data_time']
if data_time:
current_year = data_time.split('年')[0]
else:
current_year = str(datetime.now().year)
# current_year = "2022"
district_li1 = ["全市", "城区", "泽州县", "高平市", "阳城县",
"陵川县", "沁水县", "晋城经济技术开发区"]
now_time = (datetime.now() - relativedelta(years=1)).strftime('%Y-%m-%d')
now_time = now_time.split('-')
data_time = now_time[0] + '年' + now_time[1] + '月' + now_time[2] + '号-至今'
# now_time = (datetime.now() - relativedelta(years=1)).strftime('%Y-%m-%d')
# now_time = now_time.split('-')
# data_time = now_time[0] + '年' + now_time[1] + '月' + now_time[2] + '号-至今'
target_data_li = []
if flag == 1: # 签约项目完成情况
try:
target_data_li = get_data1([], district_li1, current_year)
target_data_li = get_data1(data_time, district_li1, current_year)
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
......@@ -1399,7 +1403,7 @@ def get_data():
if flag == 2: # 项目开工完成情况
try:
target_data_li = get_data2([], district_li1, current_year)
target_data_li = get_data2(data_time, district_li1, current_year)
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
......@@ -1407,7 +1411,7 @@ def get_data():
if flag == 3: # 新开工项目计划投资额完情况
try:
target_data_li = get_data3([], district_li1, current_year)
target_data_li = get_data3(data_time, district_li1, current_year)
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
......@@ -1415,7 +1419,7 @@ def get_data():
if flag == 4: # 固投资金完成情况
try:
target_data_li = get_data4([], district_li1, current_year)
target_data_li = get_data4(data_time, district_li1, current_year)
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
......@@ -1423,7 +1427,7 @@ def get_data():
if flag == 5: # 非固投资金完成情况
try:
target_data_li = get_data5([], district_li1, current_year)
target_data_li = get_data5(data_time, district_li1, current_year)
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
......
apps/models.py
......@@ -39,7 +39,7 @@ class IndustryChain(db.Model):
industry_type = db.Column(db.Integer, comment='行业类型(0是产业集群，1是上游行业，2是中游行业，3是下游行业)')
relate_id = db.Column(db.Integer, comment='关系id(关联哪个产业环节')
chain_id = db.Column(db.Integer, comment='关系id(关联哪个产业链')
enterprise = db.relationship('Enterprise', backref=db.backref('enterprise'))
# enterprise = db.relationship('Enterprise', backref=db.backref('enterprise'))
enterprise_num = db.Column(db.Integer, comment='相关全企业表数量')
......@@ -48,7 +48,8 @@ class Enterprise(db.Model):
__tablename__ = "enterprise"
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='企业主键id', comment='企业主键id主键id') # 企业
industry_chain_id = db.Column(db.Integer, db.ForeignKey('industry_chain.id'))
# company_id = db.Column(db.Integer, index=True, unique=True, comment='企业id') # 企业
company_id = db.Column(db.String(255), index=True, comment='企业id') # 企业
company_name = db.Column(db.String(255), index=True, doc='企业名', comment='企业名') # 企业名
status = db.Column(db.String(32), doc='经营状态', comment='经营状态') # 经营状态
legal = db.Column(db.String(255), doc='发定代表人', comment='发定代表人') # 发定代表人
......@@ -1777,6 +1778,7 @@ class IntroductionMeet(db.Model):
__table_args__ = ({'comment': '小程序-推介会数据表'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
name = db.Column(db.String(20), comment='推介会名字')
flag = db.Column(db.Integer, comment='推介会类型 1往期，2即将举办')
time = db.Column(db.String(100), default='', comment='时间段')
organizer = db.Column(db.String(20), default='', comment='举办方')
img_url = db.Column(db.String(255), comment='推介会封面')
......@@ -1802,15 +1804,18 @@ class CustomerConsultation(db.Model):
__table_args__ = ({'comment': '小程序-客户咨询信息表'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
project_name = db.Column(db.String(200), comment='项目名称')
investor = db.Column(db.Integer, comment='投资方名称')
investor = db.Column(db.String(100), comment='投资方名称')
investor_place = db.Column(db.String(100), default='', comment='投资方所在地')
project_type = db.Column(db.String(200), default='', comment='项目类型')
investment_volume = db.Column(db.Text, comment='总投资额')
investment_volume = db.Column(db.Float, comment='总投资额')
basic_information = db.Column(db.Text, comment='项目方基本情况')
land_area = db.Column(db.Text, comment='拟落地区域')
linkman = db.Column(db.String(20), comment='联系人')
link_mobile = db.Column(db.String(20), comment='联系方式')
consultation_time = db.Column(db.DateTime, default='', comment='咨询时间')
reply_time = db.Column(db.DateTime, default='', comment='回复时间')
flag = db.Column(db.Integer, comment='是否已回复 0否1是')
is_sync = db.Column(db.Integer, comment='是否同步到平台 0否1是')
reply_content = db.Column(db.Text, comment='回复内容')
apps/view_atlas/view.py
......@@ -418,6 +418,8 @@ def industry_resource():
"nature": i.nature,
"ccode": i.ccode,
"address": i.address,
"lng": i.lng,
"lat": i.lat,
} for i in college],
"size": size}
return jsonify(code=RET.OK, msg="查询成功", data=data)
......@@ -453,7 +455,10 @@ def industry_resource():
"cate": i.cate,
"fax": i.fax,
"postcode": i.postcode,
"address": i.address} for i in lab],
"address": i.address,
"lng": i.lng,
"lat": i.lat
} for i in lab],
"size": size}
return jsonify(code=RET.OK, msg="查询成功", data=data)
else:
......@@ -487,8 +492,13 @@ def get_data(name, industry_level, select_flag, page, perpage):
"area": i.area,
"address": i.address,
"navigat": i.navigat,
"cluster": i.cluster} for i in induzone],
"size": size}
"cluster": i.cluster,
"lng": i.lng,
"lat": i.lat,
"phone": i.phone,
} for i in induzone],
"size": size,
}
return admin_data
if select_flag in [2, 7]:
......@@ -502,8 +512,10 @@ def get_data(name, industry_level, select_flag, page, perpage):
"level": i.level, # 园区级别
"navigat": i.navigat,
"cate": i.cate, # 园区类型
"address": i.address, } for i in induzone], # 园区地址
"size": size}
"address": i.address,
"lng": i.lng,
"lat": i.lat,
} for i in induzone], "size": size}
return garden_data
# if select_flag == 3: # 当选择载体土地时
......@@ -764,6 +776,7 @@ def industry_policy():
"id": i.id,
"name": i.name,
"org": i.org,
"file": i.file,
"pubdate": (i.pubdate).strftime("%Y-%m-%d"),
} for i in indu_policy],
"size": size
......@@ -951,6 +964,8 @@ def get_zaiti_detail_data():
"people_num": induzone.people_num,
"carrier_form": induzone.carrier_form,
"area_structure": induzone.area_structure,
"lng": induzone.lng,
"lat": induzone.lat,
"resource_data": resource_data,
"labor_data": labor_data
}
......
apps/view_choose/choose_view.py
......@@ -233,11 +233,13 @@ def global_build(key_words, district_name, build_name, industry_name, build_type
"carrier_type": "商业楼宇",
"district_name": build_obj.district_name,
"build_name": build_obj.build_name,
"build_area": build_obj.build_area,
"detail_address": build_obj.detail_address, # 审核信息
# "industry_name": build_obj.industry_name,
"layer_num": build_obj.layer_num,
"build_type": build_obj.build_type,
"attract_status": build_obj.attract_status,
"rent_money": build_obj.rent_money,
"lng": build_obj.lng,
"lat": build_obj.lat
} for build_obj in build_obj_list]
......
apps/view_choose/fill_data.py
......@@ -1384,6 +1384,8 @@ def carrier_detail():
"wuye_money": carrier_obj.wuye_money, # 物业费（元/平米/月）
"linkman": carrier_obj.linkman, # 联系人
"link_mobile": carrier_obj.link_mobile, # 联系方式
"lng": carrier_obj.lng,
"lat": carrier_obj.lat,
"inside_picture_url": [
{"url": carrier_obj.inside_picture_url}] if carrier_obj.inside_picture_url else [],
"outer_picture_url": [
......@@ -1418,6 +1420,8 @@ def carrier_detail():
"linkman": carrier_obj.linkman, # 联系人
"telephone": carrier_obj.telephone, # 联系方式
"other_requirements": carrier_obj.other_requirements, # 其他要求
"lng": carrier_obj.lng,
"lat": carrier_obj.lat,
"price_url": [
{"url": carrier_obj.price_url}] if carrier_obj.price_url else [],
}]
......@@ -1454,6 +1458,8 @@ def carrier_detail():
"rent_money": carrier_obj.rent_money, # 租金（元/平米/天）
"linkman": carrier_obj.linkman, # 联系人
"link_mobile": carrier_obj.link_mobile, # 联系方式
"lng": carrier_obj.lng,
"lat": carrier_obj.lat,
"inside_picture_url": [
{"url": carrier_obj.inside_picture_url}] if carrier_obj.inside_picture_url else [],
"outer_picture_url": [
......
apps/utils/shell/industry_enterprise_num.py → industry_enterprise_num.py
......@@ -10,6 +10,7 @@ IndustryChain或者Enterprise数据表更新后，
计算产业环节相关企业的数量并填充到IndustryChain的enterprise_num字段中。
"""
def handle():
with app.app_context():
industry_obj_list = IndustryChain.query.all()
......
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