Skip to content

M
mancheng
Commit 78b6c728 by dong
Options

fix20221229

parent af71c51a
Showing with 129 additions and 115 deletions
apps/models.py
......@@ -313,7 +313,7 @@ class CompanyPledge(db.Model):
# 晋城企业详情担保信息
class CompanyDanbao(db.Model):
__tablename_ = "company_pledge"
__tablename_ = "company_danbao"
__table_args__ = ({'comment': '晋城企业详情担保信息'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='担保信息主键id', comment='担保信息主键id') # 企业
company_id = db.Column(db.Integer, doc='晋城企业id', comment='晋城企业id')
......@@ -327,7 +327,7 @@ class CompanyDanbao(db.Model):
# 晋城企业详情专利信息
class CompanyPatent(db.Model):
__tablename_ = "company_pledge"
__tablename_ = "company_patent"
__table_args__ = ({'comment': '晋城企业详情专利信息'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='专利信息主键id', comment='专利信息主键id') # 企业
company_id = db.Column(db.Integer, doc='晋城企业id', comment='晋城企业id')
......@@ -448,7 +448,7 @@ class EnterprisePledge(db.Model):
# 全国企业表企业详情担保信息
class EnterpriseDanbao(db.Model):
__tablename_ = "company_pledge"
__tablename_ = "company_danbao"
__table_args__ = ({'comment': '全国企业表企业详情担保信息'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='担保信息主键id', comment='担保信息主键id') # 企业
company_id = db.Column(db.Integer, doc='全国企业表企业id', comment='全国企业表企业id')
......@@ -462,7 +462,7 @@ class EnterpriseDanbao(db.Model):
# 全国企业表企业详情专利信息
class EnterprisePatent(db.Model):
__tablename_ = "company_pledge"
__tablename_ = "company_patent"
__table_args__ = ({'comment': '全国企业表企业详情专利信息'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='专利信息主键id', comment='专利信息主键id') # 企业
company_id = db.Column(db.Integer, doc='全国企业表企业id', comment='全国企业表企业id')
......@@ -901,14 +901,15 @@ class Property(db.Model):
# 查找历史表
class SearchList(BaseModel, db.Model):
__tablename__ = "search_list"
__table_args__ = ({'comment': '360企业画像--查找历史数据表'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='主键id', comment='主键id')
history = db.Column(db.String(128), doc='用户搜索历史', comment='用户搜索历史') # 用户搜索历史
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), doc='用户id', comment='用户id')
section = db.relationship('User', backref=db.backref('searchlist')) # 用户-搜索
# class SearchList(BaseModel, db.Model):
# __tablename__ = "search_list"
# __table_args__ = ({'comment': '360企业画像--查找历史数据表'}) # 添加表注释
#
# id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='主键id', comment='主键id')
# history = db.Column(db.String(128), doc='用户搜索历史', comment='用户搜索历史') # 用户搜索历史
# user_id = db.Column(db.Integer, db.ForeignKey("user.id"), doc='用户id', comment='用户id')
# section = db.relationship('User', backref=db.backref('searchlist')) # 用户-搜索
""""""
# 用户
......@@ -1013,40 +1014,40 @@ class Role(BaseModel, db.Model):
# 政府机构表（自关联多对多）
class GovOrganization(db.Model):
__tablename__ = "government_organization"
# 基本信息
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='主键id', comment='主键id')
pnums = db.Column(db.Integer, doc='人数', comment='人数')
charge = db.Column(db.String(20), doc='机构负责人', comment='机构负责人')
charge_phone = db.Column(db.String(20), doc='负责人电话', comment='负责人电话')
function = db.Column(db.Text, doc='部门职能', comment='部门职能')
# name = db.Column(db.String(30), nullable=False, view_index=True, doc='新增时间', comment='新增时间')
name = db.Column(db.String(30), doc='新增时间', comment='新增时间')
add_person = db.Column(db.String(20), doc='新增人', comment='新增人')
add_time = db.Column(db.DateTime, doc='新增时间', comment='新增时间')
edit_person = db.Column(db.String(20), doc='编辑人', comment='编辑人')
edit_time = db.Column(db.DateTime, doc='编辑时间', comment='编辑时间')
# followed 我的下级，管制谁，followers 我的上级，谁管制我
# followed = db.relationship('Government', secondary=followers, primaryjoin=(followers.c.follower_id == id),
# secondaryjoin=(followers.c.followed_id == id),
# backref=db.backref('followers', lazy='dynamic'), lazy='dynamic')
# 政府部门（政府-部门 一对多）
class GovDepartment(db.Model):
__tablename__ = "government_department"
# 基本信息
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='主键id', comment='主键id')
pnums = db.Column(db.Integer, doc='人数', comment='人数') # 人数
charge = db.Column(db.String(255), doc='部门负责人', comment='部门负责人') # 部门负责人
charge_phone = db.Column(db.String(255), doc='负责人电话', comment='负责人电话') # 负责人电话
function = db.Column(db.Text, doc='负责人电话', comment='负责人电话') # 部门职能
name = db.Column(db.String(255), nullable=False, doc='政府机构部门名称', comment='政府机构部门名称') # 政府机构部门名称
# gid = db.Column(db.Integer) # 政府id
goverment_org_id = db.Column(db.Integer, db.ForeignKey("government_organization.id"), doc='外键id，机构id',
comment='外键id，机构id')
goverment = db.relationship('GovOrganization', backref=db.backref('government_departments')) # 政府1-N部门
# class GovOrganization(db.Model):
# __tablename__ = "government_organization"
# # 基本信息
# id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='主键id', comment='主键id')
# pnums = db.Column(db.Integer, doc='人数', comment='人数')
# charge = db.Column(db.String(20), doc='机构负责人', comment='机构负责人')
# charge_phone = db.Column(db.String(20), doc='负责人电话', comment='负责人电话')
# function = db.Column(db.Text, doc='部门职能', comment='部门职能')
# # name = db.Column(db.String(30), nullable=False, view_index=True, doc='新增时间', comment='新增时间')
# name = db.Column(db.String(30), doc='新增时间', comment='新增时间')
# add_person = db.Column(db.String(20), doc='新增人', comment='新增人')
# add_time = db.Column(db.DateTime, doc='新增时间', comment='新增时间')
# edit_person = db.Column(db.String(20), doc='编辑人', comment='编辑人')
# edit_time = db.Column(db.DateTime, doc='编辑时间', comment='编辑时间')
# # followed 我的下级，管制谁，followers 我的上级，谁管制我
# # followed = db.relationship('Government', secondary=followers, primaryjoin=(followers.c.follower_id == id),
# # secondaryjoin=(followers.c.followed_id == id),
# # backref=db.backref('followers', lazy='dynamic'), lazy='dynamic')
#
#
# # 政府部门（政府-部门 一对多）
# class GovDepartment(db.Model):
# __tablename__ = "government_department"
# # 基本信息
# id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='主键id', comment='主键id')
# pnums = db.Column(db.Integer, doc='人数', comment='人数') # 人数
# charge = db.Column(db.String(255), doc='部门负责人', comment='部门负责人') # 部门负责人
# charge_phone = db.Column(db.String(255), doc='负责人电话', comment='负责人电话') # 负责人电话
# function = db.Column(db.Text, doc='负责人电话', comment='负责人电话') # 部门职能
# name = db.Column(db.String(255), nullable=False, doc='政府机构部门名称', comment='政府机构部门名称') # 政府机构部门名称
# # gid = db.Column(db.Integer) # 政府id
# goverment_org_id = db.Column(db.Integer, db.ForeignKey("government_organization.id"), doc='外键id，机构id',
# comment='外键id，机构id')
# goverment = db.relationship('GovOrganization', backref=db.backref('government_departments')) # 政府1-N部门
# 政府机构之间的上下级统筹
......@@ -1088,18 +1089,18 @@ class Section(db.Model):
# 政府组（政府1-N部门1-N组）
class Group(db.Model):
__tablename__ = "group"
# 基本信息
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
pnums = db.Column(db.Integer) # 人数
charge = db.Column(db.String(255)) # 组负责人
charge_phone = db.Column(db.String(255)) # 负责人电话
function = db.Column(db.Text) # 部门职能
name = db.Column(db.String(255), nullable=False) # 政府机构部门下组的名称
# sid = db.Column(db.Integer) # 部门id
section_id = db.Column(db.Integer, db.ForeignKey("section.id"))
section = db.relationship('Section', backref=db.backref('groups')) # 部门1-N组
# class Group(db.Model):
# __tablename__ = "group"
# # 基本信息
# id = db.Column(db.Integer, primary_key=True, autoincrement=True)
# pnums = db.Column(db.Integer) # 人数
# charge = db.Column(db.String(255)) # 组负责人
# charge_phone = db.Column(db.String(255)) # 负责人电话
# function = db.Column(db.Text) # 部门职能
# name = db.Column(db.String(255), nullable=False) # 政府机构部门下组的名称
# # sid = db.Column(db.Integer) # 部门id
# section_id = db.Column(db.Integer, db.ForeignKey("section.id"))
# section = db.relationship('Section', backref=db.backref('groups')) # 部门1-N组
"""招商资源管理"""
......@@ -1305,7 +1306,6 @@ class ShanxiTarget(db.Model):
__tablename_ = "shanxi_target"
__table_args__ = ({'comment': '项目化管理-山西省地市指标表'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
# file_name = db.Column(db.String(30), comment='文件名称')
is_delete = db.Column(db.Integer, comment='逻辑删除')
data_time = db.Column(db.String(30), comment='数据年份')
upload_time = db.Column(db.String(30), comment='上传日期')
......@@ -1372,14 +1372,15 @@ class MoneyArrive(db.Model):
# 招商图谱-产业链收藏
class IndustryCollect(db.Model):
__tablename_ = "industry_collect"
__table_args__ = ({'comment': '招商图谱-产业链收藏'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
industry_id = db.Column(db.Integer, comment='产业id')
user_id = db.Column(db.Integer, comment='用户id')
collect_time = db.Column(db.String(30), comment='收藏时间')
industry_name = db.Column(db.String(30), comment='收藏的产业名称')
# class IndustryCollect(db.Model):
# __tablename_ = "industry_collect"
# __table_args__ = ({'comment': '招商图谱-产业链收藏'}) # 添加表注释
# id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
# industry_id = db.Column(db.Integer, comment='产业id')
# user_id = db.Column(db.Integer, comment='用户id')
# collect_time = db.Column(db.String(30), comment='收藏时间')
# industry_name = db.Column(db.String(30), comment='收藏的产业名称')
""""""
# 用户关注行业，多-多
......@@ -1613,25 +1614,26 @@ class CarrierFactory(db.Model):
# 载体资源库-产业地图-各载体类型面积数据表
class CarrierArea(db.Model):
__tablename_ = "carrier_area"
__table_args__ = ({'comment': '载体资源库-产业地图-各载体类型面积数据表'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
district_name = db.Column(db.String(20), comment='区域名称')
lng = db.Column(db.String(50), comment='经度')
lat = db.Column(db.String(50), comment='维度')
build_area = db.Column(db.String(20), comment='楼宇当前总面积(㎡)')
build_current_empty_area = db.Column(db.String(20), comment='楼宇当前闲置面积(㎡)')
build_last_empty_area = db.Column(db.String(20), comment='楼宇去年闲置面积(㎡)')
factory_area = db.Column(db.String(20), comment='厂房当前总面积(㎡)')
factory_current_empty_area = db.Column(db.String(20), comment='厂房当前闲置面积(㎡)')
factory_last_empty_area = db.Column(db.String(20), comment='厂房去年闲置面积(㎡)')
plan_land_store_area = db.Column(db.String(20), comment='计划土地储备面积(亩)')
plan_land_supply_area = db.Column(db.String(20), comment='计划土地供应面积(亩)')
plan_land_stock_area = db.Column(db.String(20), comment='计划土地存量面积(亩)')
land_area = db.Column(db.String(20), comment='土地当前总面积(亩)')
land_current_empty_area = db.Column(db.String(20), comment='土地当前闲置面积(亩)')
land_last_empty_area = db.Column(db.String(20), comment='土地去年闲置面积(亩)')
# class CarrierArea(db.Model):
# __tablename_ = "carrier_area"
# __table_args__ = ({'comment': '载体资源库-产业地图-各载体类型面积数据表'}) # 添加表注释
# id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
# district_name = db.Column(db.String(20), comment='区域名称')
# lng = db.Column(db.String(50), comment='经度')
# lat = db.Column(db.String(50), comment='维度')
# build_area = db.Column(db.String(20), comment='楼宇当前总面积(㎡)')
# build_current_empty_area = db.Column(db.String(20), comment='楼宇当前闲置面积(㎡)')
# build_last_empty_area = db.Column(db.String(20), comment='楼宇去年闲置面积(㎡)')
# factory_area = db.Column(db.String(20), comment='厂房当前总面积(㎡)')
# factory_current_empty_area = db.Column(db.String(20), comment='厂房当前闲置面积(㎡)')
# factory_last_empty_area = db.Column(db.String(20), comment='厂房去年闲置面积(㎡)')
# plan_land_store_area = db.Column(db.String(20), comment='计划土地储备面积(亩)')
# plan_land_supply_area = db.Column(db.String(20), comment='计划土地供应面积(亩)')
# plan_land_stock_area = db.Column(db.String(20), comment='计划土地存量面积(亩)')
# land_area = db.Column(db.String(20), comment='土地当前总面积(亩)')
# land_current_empty_area = db.Column(db.String(20), comment='土地当前闲置面积(亩)')
# land_last_empty_area = db.Column(db.String(20), comment='土地去年闲置面积(亩)')
""""""
# 载体资源库-产业地图-水电气热能源数据表
......@@ -1661,28 +1663,28 @@ class CarrierEnergy(db.Model):
# 载体资源库-产业地图-各区县闲置环比按月份区分显示图数据表
class CarrierAreaData(db.Model):
__tablename_ = "carrier_rate_data"
__table_args__ = ({'comment': '载体资源库-产业地图-各区县各载体闲置面积数据表'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
district_name = db.Column(db.String(20), comment='区域名称')
land_year = db.Column(db.String(20), comment='土地全年闲置面积')
land_one = db.Column(db.String(20), comment='土地第一季度闲置面积')
land_two = db.Column(db.String(20), comment='土地第二季度闲置面积')
land_three = db.Column(db.String(20), comment='土地第三季度闲置面积')
land_four = db.Column(db.String(20), comment='土地第四季度闲置面积')
factory_year = db.Column(db.String(20), comment='厂房全年闲置面积')
factory_one = db.Column(db.String(20), comment='厂房第一季度闲置面积')
factory_two = db.Column(db.String(20), comment='厂房第二季度闲置面积')
factory_three = db.Column(db.String(20), comment='厂房第三季度闲置面积')
factory_four = db.Column(db.String(20), comment='厂房第四季度闲置面积')
build_year = db.Column(db.String(20), comment='楼宇全年闲置面积')
build_one = db.Column(db.String(20), comment='楼宇第一季度闲置面积')
build_two = db.Column(db.String(20), comment='楼宇第二季度闲置面积')
build_three = db.Column(db.String(20), comment='楼宇第三季度闲置面积')
build_four = db.Column(db.String(20), comment='楼宇第四季度闲置面积')
# class CarrierAreaData(db.Model):
# __tablename_ = "carrier_rate_data"
# __table_args__ = ({'comment': '载体资源库-产业地图-各区县各载体闲置面积数据表'}) # 添加表注释
# id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
# district_name = db.Column(db.String(20), comment='区域名称')
# land_year = db.Column(db.String(20), comment='土地全年闲置面积')
# land_one = db.Column(db.String(20), comment='土地第一季度闲置面积')
# land_two = db.Column(db.String(20), comment='土地第二季度闲置面积')
# land_three = db.Column(db.String(20), comment='土地第三季度闲置面积')
# land_four = db.Column(db.String(20), comment='土地第四季度闲置面积')
#
# factory_year = db.Column(db.String(20), comment='厂房全年闲置面积')
# factory_one = db.Column(db.String(20), comment='厂房第一季度闲置面积')
# factory_two = db.Column(db.String(20), comment='厂房第二季度闲置面积')
# factory_three = db.Column(db.String(20), comment='厂房第三季度闲置面积')
# factory_four = db.Column(db.String(20), comment='厂房第四季度闲置面积')
#
# build_year = db.Column(db.String(20), comment='楼宇全年闲置面积')
# build_one = db.Column(db.String(20), comment='楼宇第一季度闲置面积')
# build_two = db.Column(db.String(20), comment='楼宇第二季度闲置面积')
# build_three = db.Column(db.String(20), comment='楼宇第三季度闲置面积')
# build_four = db.Column(db.String(20), comment='楼宇第四季度闲置面积')
# 记录操作日志得数据表
......
apps/view_index/view.py
......@@ -28,17 +28,29 @@ def industry_distribute():
try:
indu_obj_list = IndustryDistribute.query.all()
industry_num_list = []
data_list = []
if flag == 1:
data_dic = [{
for i in indu_obj_list:
if i.industry_num:
industry_num_list.append(i.industry_num)
data_dic = {
"industry_name": i.industry_name,
"industry_num": i.industry_num,
} for i in indu_obj_list]
"industry_num": i.industry_num if i.industry_num else 0
}
data_list.append(data_dic)
# data = {"data": data_list, "total": sum(industry_num_list)}
if flag == 2:
data_dic = [{
for i in indu_obj_list:
if i.industry_num:
industry_num_list.append(i.investment_volume)
data_dic = {
"industry_name": i.industry_name,
"investment_volume": i.investment_volume,
} for i in indu_obj_list]
return jsonify(code=RET.OK, data=data_dic, msg='查询成功!')
"investment_volume": i.investment_volume
}
data_list.append(data_dic)
data = {"data": data_list, "total": round(sum(industry_num_list), 2)}
return jsonify(code=RET.OK, data=data, msg='查询成功!')
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据库错误")
......
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