fix20230220

apps/models.py

@@ -973,111 +973,6 @@ class Lab(db.Model):
 """"""
 
 
-# 产业载体-土地数据
-class ZaitiLand(db.Model):
-    __tablename_ = "zaiti_land"
-    __table_args__ = ({'comment': '产业载体-土地数据表'})
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    name = db.Column(db.String(20), comment='土地名称')
-    lng = db.Column(db.String(50), comment='经度')
-    lat = db.Column(db.String(50), comment='维度')
-    code = db.Column(db.String(20), comment='土地编码')
-    district = db.Column(db.String(50), comment='所属县区')
-    development_area = db.Column(db.String(20), comment='所属开发区')
-    location = db.Column(db.String(50), comment='土地位置')
-    land_use = db.Column(db.String(255), comment='用地四至')
-    nature = db.Column(db.String(20), comment='用地性质(工业用地/商服用地/物流仓储用地/科研用地/居住用地)（包括用地性质类别代码）')
-    area = db.Column(db.String(255), comment='用地面积（净用地面积）（公顷）')
-    surface_area = db.Column(db.String(20), comment='地上控制建面（㎡）')
-    plot_ratio = db.Column(db.String(10), comment='容积率')
-    greening_rate = db.Column(db.String(20), comment='绿化率')
-    density = db.Column(db.String(20), comment='建筑密度')
-    height_permitted = db.Column(db.String(20), comment='限高（㎡）')
-    transfer_year = db.Column(db.String(20), comment='出让年限')
-    develop_degree = db.Column(db.String(20), comment='用地开发程度（请详细描述几通一平）')
-    investment_intensity = db.Column(db.String(20), comment='投资强度（万元/亩）')
-    output_intensity = db.Column(db.String(20), comment='产出强度（万元/亩）')
-    tax = db.Column(db.String(20), comment='地均税收（万元/亩）')
-    linkman = db.Column(db.String(20), comment='联系人')
-    telephone = db.Column(db.String(20), comment='联系方式')
-    red_line_map = db.Column(db.String(20), comment='用地红线图')
-    other_requirements = db.Column(db.String(20), comment='其他要求')
-
-
-# 产业载体-楼宇数据
-class ZaitiBuild(db.Model):
-    __tablename_ = "zaiti_build"
-    __table_args__ = ({'comment': '产业载体-楼宇数据表'})
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    name = db.Column(db.String(20), comment='楼宇名称')
-    lng = db.Column(db.String(50), comment='经度')
-    lat = db.Column(db.String(50), comment='维度')
-    district = db.Column(db.String(50), comment='所属县区')
-    development_area = db.Column(db.String(50), comment='所属开发区')
-    buide_type = db.Column(db.String(20), comment='楼宇类型(商铺/写字楼/其他)')
-    level = db.Column(db.String(255), comment='写字楼等级（甲/乙/其他）')
-    address = db.Column(db.String(20), comment='详细地址（地址需填写准确、详细、精准）')
-    build_time = db.Column(db.String(20), comment='建成时间（年）')
-    land_area = db.Column(db.String(10), comment='总占地面积（㎡）')
-    build_area = db.Column(db.String(20), comment='总建筑面积（㎡）')
-    single_area = db.Column(db.String(20), comment='单层面积（㎡）')
-    empty_area = db.Column(db.String(20), comment='闲置面积（㎡）')
-    layer_num = db.Column(db.Integer, comment='总层数')
-    carport = db.Column(db.Integer, comment='车位（个）')
-    elevator = db.Column(db.Integer, comment='电梯（部）')
-    is_water = db.Column(db.String(20), comment='是否已通水(是/否)')
-    is_electric = db.Column(db.String(20), comment='是否已通电(是/否)')
-    is_warm = db.Column(db.String(20), comment='是否已通暖(是/否)')
-    is_gas = db.Column(db.String(20), comment='是否已通燃气(是/否)')
-    is_internet = db.Column(db.String(20), comment='是否已通网络(是/否)')
-    is_divide = db.Column(db.String(20), comment='是否可以分割(是/否)')
-    attract_industry = db.Column(db.String(20), comment='拟招引产业')
-    cooperation_model = db.Column(db.String(20), comment='合作模式(出租/出售/转让)')
-    rent = db.Column(db.String(20), comment='租金（元/平米/天）')
-    property_fee = db.Column(db.String(20), comment='物业费（元/平米/月）')
-    linkman = db.Column(db.String(20), comment='联系人')
-    telephone = db.Column(db.String(20), comment='联系方式')
-    build_pic = db.Column(db.String(20), comment='楼宇图片')
-
-
-# 产业载体-厂房数据
-class ZaitiFactory(db.Model):
-    __tablename_ = "zaiti_factory"
-    __table_args__ = ({'comment': '产业载体-厂房数据表'})
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
-    name = db.Column(db.String(20), comment='厂房名称')
-    lng = db.Column(db.String(50), comment='经度')
-    lat = db.Column(db.String(50), comment='维度')
-    district = db.Column(db.String(50), comment='所属县区')
-    development_area = db.Column(db.String(50), comment='所属开发区')
-    buide_type = db.Column(db.String(20), comment='厂房类型（单层/多层/混合层）')
-    is_standard = db.Column(db.String(20), comment='是否标准化厂房(是/否)')
-    address = db.Column(db.String(50), comment='详细地址（地址需填写准确、详细、精准）')
-    build_time = db.Column(db.String(20), comment='建成时间（年）')
-    land_area = db.Column(db.String(20), comment='总占地面积（㎡）')
-    build_area = db.Column(db.String(255), comment='总建筑面积（㎡）')
-    empty_area = db.Column(db.String(20), comment='闲置面积（㎡）')
-    layer_num = db.Column(db.String(20), comment='总层数')
-    factory_structure = db.Column(db.String(20), comment='建筑结构（混凝土框架、钢结构、砖混、砖混钢筋、钢筋混凝土、轻钢）')
-    width = db.Column(db.String(10), comment='跨度（m）')
-    high = db.Column(db.String(20), comment='层高（m）')
-    bearing = db.Column(db.String(20), comment='承重（kg/㎡）')
-    is_water = db.Column(db.String(20), comment='是否已通水(是/否)')
-    is_electric = db.Column(db.String(20), comment='是否已通电(是/否)')
-    is_warm = db.Column(db.String(20), comment='是否已通暖(是/否)')
-    is_gas = db.Column(db.String(20), comment='是否已通燃气(是/否)')
-    is_internet = db.Column(db.String(20), comment='是否已通网络(是/否)')
-    is_car = db.Column(db.String(20), comment='是否可安装天车')
-    elevator = db.Column(db.String(20), comment='电梯(部)')
-    attract_industry = db.Column(db.String(20), comment='拟招引产业（下拉筛选）')
-    settled_enterprise = db.Column(db.String(20), comment='已入驻企业（企业全称，使用面积）')
-    cooperation_model = db.Column(db.String(20), comment='合作模式(出租/出售/转让)')
-    rent = db.Column(db.String(20), comment='租金（元/平米/天）')
-    linkman = db.Column(db.String(20), comment='联系人')
-    telephone = db.Column(db.String(20), comment='联系方式')
-    factory_pic = db.Column(db.String(20), comment='厂房图片')
-
-
 # 雷达评估页行业在不同地区的测评分数
 class EvaluationNodeData(db.Model):
     __tablename_ = "evaluation_data"
@@ -1642,157 +1537,341 @@ class UserEnterprise(BaseModel, db.Model):
     enterprise_id = db.Column(db.Integer, db.ForeignKey("enterprise.id"), primary_key=True)
 
 
-# 载体资源库-数据填报-楼宇详情表
-class CarrierBuild(db.Model):
-    __tablename_ = "carrier_build"
-    __table_args__ = ({'comment': '载体资源库-楼宇详情表'})  # 添加表注释
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
+# # 载体资源库-数据填报-楼宇详情表
+# class CarrierBuild(db.Model):
+#     __tablename_ = "carrier_build"
+#     __table_args__ = ({'comment': '载体资源库-楼宇详情表'})  # 添加表注释
+#     id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
+#
+#     district_name = db.Column(db.String(50), comment='区域名称')
+#     build_name = db.Column(db.String(50), comment='楼宇名称')
+#     industry_name = db.Column(db.String(255), comment='产业名称')
+#     industry_type = db.Column(db.String(20), comment='产业类型')
+#     total_area = db.Column(db.String(20), comment='总面积(㎡)')
+#     # total_area_id = db.Column(db.Integer,
+#     #                           comment='总面积范围id(1:0-500㎡；2:500-1000㎡；3:1000-2000㎡；4:2000-5000㎡；5:5000-10000㎡)')
+#     cover_land_area = db.Column(db.String(20), comment='占地面积(㎡)')
+#     # cover_land_area_id = db.Column(db.Integer,
+#     #                                comment='占地面积范围id(1:0-500㎡；2:500-1000㎡；3:1000-2000㎡；4:2000-5000㎡；5:5000-10000㎡)')
+#     build_type = db.Column(db.String(20), comment='楼宇类型')
+#     # build_type_id = db.Column(db.Integer, comment='楼宇类型id(1:商铺；2:写字楼)')
+#     rent_rate = db.Column(db.String(20), comment='出租率')
+#     # rent_rate_id = db.Column(db.Integer, comment='出租率id(1:0-50％；2:50-80％；3:80-90％；4:90-100％；)')
+#     layer_num = db.Column(db.Integer, comment='总层数（层，填写整数）')
+#     detail_address = db.Column(db.String(50), comment='详细地址')
+#     lng = db.Column(db.String(50), comment='经度')
+#     lat = db.Column(db.String(50), comment='维度')
+#
+#     construction_time = db.Column(db.String(20), default='', comment='建设时间(例如：2022年)')
+#     upload_time = db.Column(db.DateTime, default='', comment='数据上传时间')
+#     # 权限相关
+#     upload_people = db.Column(db.String(20), comment='数据上传人')
+#     upload_people_id = db.Column(db.String(20), comment='数据上传人用户id')
+#     upload_people_role_id = db.Column(db.String(20), comment='数据上传人权限id')
+#     upload_people_belong = db.Column(db.String(100), comment='数据上传人所属区县、机构、部门')
+#
+#     fix_time = db.Column(db.DateTime, default='', comment='数据修改时间')
+#     fix_people = db.Column(db.String(20), comment='数据修改人')
+#     build_status = db.Column(db.String(20), comment='楼宇状态')
+#     # rent_money = db.Column(db.String(20), comment='租金（万元）')
+#     rent_money = db.Column(db.String(20), comment='租金范围（元/平米/天）')
+#     wuye_money = db.Column(db.String(20), comment='物业费（元/平米/天）')
+#     audit_status = db.Column(db.Integer, comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过')
+#     audit_message = db.Column(db.String(50), comment='审核附言')
+#
+#     build_info = db.Column(db.String(255), comment='楼宇介绍')
+#     inside_picture_url = db.Column(db.String(255), comment='内部照片url')
+#     outer_picture_url = db.Column(db.String(255), comment='外部照片url')
+#     price_url = db.Column(db.String(255), comment='平面图url')
+#
+#     car_space_num = db.Column(db.Integer, comment='车位数（个，填写整数）')
+#     lift_num = db.Column(db.Integer, comment='电梯数（部，填写整数）')
+#     rentout_status = db.Column(db.String(20), comment='出租状态')
+#     linkman = db.Column(db.String(20), comment='联系人')
+#     link_mobile = db.Column(db.String(20), comment='联系方式')
+#     build_area = db.Column(db.String(20), comment='建筑面积(㎡)')
+#
+#     empty_area = db.Column(db.String(20), comment='闲置面积(㎡)')
+#     build_structure = db.Column(db.String(20), comment='建筑结构')
+#     owner = db.Column(db.String(20), comment='权属人')
+#     attract_status = db.Column(db.String(20), comment='拟招引状态')
+#     attract_industry_status = db.Column(db.String(20), comment='招引业态')
+#     cooperation_model = db.Column(db.String(20), comment='合作模式')
+#     attract_advantage = db.Column(db.String(255), comment='招商优势')
+#     policy = db.Column(db.String(255), comment='优惠政策')
+#
+#     # settled_company = db.Column(db.String(255), comment='入住企业名称（多个，列表形式，顿号分隔）')
+#     # surround_facility = db.Column(db.String(255), comment='周边配套（多个，列表形式，顿号分隔）')
+#     # education_name = db.Column(db.String(255), comment='教育机构名称（多个，列表形式，顿号分隔）')
+#     # medical_name = db.Column(db.String(255), comment='医疗设施名称（多个，列表形式，顿号分隔）')
+#     # park_name = db.Column(db.String(255), comment='大型公园名称（多个，列表形式，顿号分隔）')
+#     # shangfu_center = db.Column(db.String(255), comment='商服中心（多个，列表形式，顿号分隔）')
+#     # administration_center = db.Column(db.String(255), comment='行政中心（多个，列表形式，顿号分隔）')
+#     # transportation = db.Column(db.String(255), comment='交通设施（多个，列表形式，顿号分隔）')
+#
+#
+# # 载体资源库-数据填报-土地详情表
+# class CarrierLand(db.Model):
+#     __tablename_ = "carrier_land"
+#     __table_args__ = ({'comment': '载体资源库-土地详情表'})  # 添加表注释
+#     id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
+#     district_name = db.Column(db.String(50), comment='区域名称')
+#     land_name = db.Column(db.String(50), comment='土地名称')
+#     industry_name = db.Column(db.String(255), comment='产业名称')
+#     land_nature = db.Column(db.String(20), comment='土地性质)')
+#     land_nature_id = db.Column(db.Integer, comment='土地性质id(1:农用地；2:商业用地；3:建设用地；4:旅游用地；5:居民用地。)')
+#     detail_address = db.Column(db.String(20), comment='详细地址')
+#     lng = db.Column(db.String(50), comment='经度')
+#     lat = db.Column(db.String(50), comment='维度')
+#     total_area = db.Column(db.String(20), comment='总面积(㎡)')
+#     total_area_id = db.Column(db.Integer,
+#                               comment='总面积范围id(1:0-500㎡；2:500-1000㎡；3:1000-2000㎡；4:2000-5000㎡；5:5000-10000㎡)')
+#     industry_type = db.Column(db.String(20), comment='产业类型')
+#     jing_area = db.Column(db.String(20), comment='净面积(㎡)')
+#     transfer_year = db.Column(db.String(20), comment='出让年限（年）')
+#     transfer_year_id = db.Column(db.Integer, comment='出让年限范围id(1:0-5年；2:5-10年；3:10-15年；4:15-20年；5:20年以上)')
+#
+#     land_code = db.Column(db.String(50), comment='土地编码')
+#     upload_time = db.Column(db.DateTime, default='', comment='数据上传时间')
+#     upload_people = db.Column(db.String(20), comment='数据上传人名字')
+#     upload_people_id = db.Column(db.String(20), comment='数据上传人用户id')
+#     upload_people_role_id = db.Column(db.String(20), comment='数据上传人权限id')
+#     upload_people_belong = db.Column(db.String(100), comment='数据上传人所属区县、机构、部门')
+#     fix_time = db.Column(db.DateTime, default='', comment='数据修改时间')
+#     fix_people = db.Column(db.String(20), comment='数据修改人名字')
+#     land_status = db.Column(db.Integer, comment='土地状态 0为闲置；1为占用')
+#     audit_status = db.Column(db.Integer, comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过')
+#     audit_message = db.Column(db.String(50), comment='审核附言')
+#     attract_status = db.Column(db.String(20), comment='拟招引状态')
+#
+#     linkman = db.Column(db.String(20), comment='联系人')
+#     link_mobile = db.Column(db.String(20), comment='联系方式')
+#     land_info = db.Column(db.String(255), comment='土地介绍')
+#     inside_picture_url = db.Column(db.String(255), comment='内部照片url')
+#     outer_picture_url = db.Column(db.String(255), comment='外部照片url')
+#     plot_ratio = db.Column(db.String(20), comment='容积率')
+#     sales_price = db.Column(db.String(20), comment='销售均价（毛坯）（万元）')
+#     max_sales_price = db.Column(db.String(20), comment='最高销售单价（万元）')
+#     max_car_space_price = db.Column(db.String(20), comment='车位最高销售单价')
+#     plan_target = db.Column(db.String(20), comment='规划指标')
+#     plan_condition = db.Column(db.String(20), comment='规划条件')
+#     price_url = db.Column(db.String(255), comment='规划图url')
+#
+#     surround_facility = db.Column(db.String(255), comment='周边配套（多个，列表形式，顿号分隔）')
+#     education_name = db.Column(db.String(255), comment='教育机构名称（多个，列表形式，顿号分隔）')
+#     medical_name = db.Column(db.String(255), comment='医疗设施名称（多个，列表形式，顿号分隔）')
+#     park_name = db.Column(db.String(255), comment='大型公园名称（多个，列表形式，顿号分隔）')
+#     shangfu_center = db.Column(db.String(255), comment='商服中心（多个，列表形式，顿号分隔）')
+#     administration_center = db.Column(db.String(255), comment='行政中心（多个，列表形式，顿号分隔）')
+#     policy = db.Column(db.String(255), comment='相关政策（多个，列表形式，顿号分隔）')
+#
+#
+# # 载体资源库-数据填报-厂房详情表
+# class CarrierFactory(db.Model):
+#     __tablename_ = "carrier_factory"
+#     __table_args__ = ({'comment': '载体资源库-厂房详情表'})  # 添加表注释
+#     id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
+#     district_name = db.Column(db.String(50), comment='区域名称')
+#     factory_name = db.Column(db.String(50), comment='厂房名称')
+#     # is_standard = db.Column(db.Integer, comment='是否为标准化厂房(是1否0)')
+#     # rent_status = db.Column(db.Integer, comment='是否对外租赁(是1否0)')
+#     is_standard = db.Column(db.String(10), comment='是否为标准化厂房(是或否)')
+#     rent_status = db.Column(db.String(10), comment='是否对外租赁(是或否)')
+#     # rent_money = db.Column(db.String(20), comment='租金（万元）')
+#     rent_money = db.Column(db.String(20), comment='租金范围（元/平米/天）')
+#     detail_address = db.Column(db.String(20), comment='详细地址')
+#     factory_area = db.Column(db.String(20), comment='建筑面积(㎡)')
+#     cover_land_area = db.Column(db.String(20), comment='占地面积(㎡)')
+#     cover_land_area_id = db.Column(db.Integer,
+#                                    comment='占地面积范围id(1:0-500㎡；2:500-1000㎡；3:1000-2000㎡；4:2000-5000㎡；5:5000-10000㎡)')
+#     industry_name = db.Column(db.String(255), comment='产业名称')
+#     property_type = db.Column(db.String(50), comment='产权类型')
+#
+#     construction_time = db.Column(db.String(20), default='', comment='建设时间(例如：2022年)')
+#     upload_time = db.Column(db.DateTime, default='', comment='数据上传时间')
+#     upload_people = db.Column(db.String(20), comment='数据上传人名字')
+#     upload_people_id = db.Column(db.String(20), comment='数据上传人用户id')
+#     upload_people_role_id = db.Column(db.String(20), comment='数据上传人权限id')
+#     upload_people_belong = db.Column(db.String(100), comment='数据上传人所属区县、机构、部门')
+#
+#     fix_time = db.Column(db.DateTime, default='', comment='数据修改时间')
+#     fix_people = db.Column(db.String(20), comment='数据修改人名字')
+#     factory_status = db.Column(db.String(50), comment='厂房状态')
+#     audit_status = db.Column(db.String(20), comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过；')
+#     audit_message = db.Column(db.String(50), comment='审核附言')
+#     lng = db.Column(db.String(50), comment='经度')
+#     lat = db.Column(db.String(50), comment='维度')
+#     factory_info = db.Column(db.String(255), comment='厂房介绍')
+#     inside_picture_url = db.Column(db.String(255), comment='内部照片url')
+#     outer_picture_url = db.Column(db.String(255), comment='外部照片url')
+#     price_url = db.Column(db.String(255), comment='平面图url')
+#
+#     # owner = db.Column(db.String(20), comment='权属人')
+#     empty_area = db.Column(db.String(20), comment='闲置面积(㎡)')
+#     factory_structure = db.Column(db.String(20), comment='建筑结构')
+#     width = db.Column(db.String(20), comment='跨度（米）')
+#     high = db.Column(db.String(20), comment='层高（米）')
+#     bearing = db.Column(db.String(20), comment='承重（500kg/m2）')
+#     linkman = db.Column(db.String(20), comment='联系人')
+#     link_mobile = db.Column(db.String(20), comment='联系方式')
+#     # is_electric = db.Column(db.Integer, comment='是否已通电(是1否0,填写整数)')
+#     # is_water = db.Column(db.Integer, comment='是否已通水(是1否0,填写整数)')
+#     # is_warm = db.Column(db.Integer, comment='是否已通暖(是1否0,填写整数)')
+#     # is_gas = db.Column(db.Integer, comment='是否已通燃气(是1否0,填写整数)')
+#     # is_network = db.Column(db.Integer, comment='是否已通网络(是1否0,填写整数)')
+#     # is_lift = db.Column(db.Integer, comment='是否有电梯(是1否0)')
+#     is_electric = db.Column(db.String(10), comment='是否已通电(是或否)')
+#     is_water = db.Column(db.String(10), comment='是否已通水(是或否)')
+#     is_warm = db.Column(db.String(10), comment='是否已通暖(是或否)')
+#     is_gas = db.Column(db.String(10), comment='是否已通燃气(是或否)')
+#     is_network = db.Column(db.String(10), comment='是否已通网络(是或否)')
+#     is_lift = db.Column(db.String(10), comment='是否有电梯(是或否)')
+#     lift_num = db.Column(db.Integer, comment='电梯数量（部,填写整数）')
+#     is_car_space = db.Column(db.Integer, comment='是否有车位(是1否0)')
+#     # car_space_num = db.Column(db.Integer, comment='车位数（个,填写整数）')
+#     layer_num = db.Column(db.Integer, comment='总层数（层,填写整数）')
+#     attract_status = db.Column(db.String(20), comment='拟招引状态')
+#     cooperation_model = db.Column(db.String(20), comment='合作模式')
+#     attract_advantage = db.Column(db.String(255), comment='招商优势')
+#     policy = db.Column(db.String(255), comment='相关政策')
+#     # settled_company = db.Column(db.String(255), comment='入住企业名称（多个，列表形式，顿号分隔）')
+#     # surround_facility = db.Column(db.String(255), comment='周边配套（多个，列表形式，顿号分隔）')
+#     # education_name = db.Column(db.String(255), comment='教育机构名称（多个，列表形式，顿号分隔）')
+#     # medical_name = db.Column(db.String(255), comment='医疗设施名称（多个，列表形式，顿号分隔）')
+#     # park_name = db.Column(db.String(255), comment='大型公园名称（多个，列表形式，顿号分隔）')
+#     # shangfu_center = db.Column(db.String(255), comment='商服中心（多个，列表形式，顿号分隔）')
+#     # administration_center = db.Column(db.String(255), comment='行政中心（多个，列表形式，顿号分隔）')
+#     # transportation = db.Column(db.String(255), comment='交通设施（多个，列表形式，顿号分隔）')
 
-    district_name = db.Column(db.String(50), comment='区域名称')
-    build_name = db.Column(db.String(50), comment='楼宇名称')
-    industry_name = db.Column(db.String(255), comment='产业名称')
-    industry_type = db.Column(db.String(20), comment='产业类型')
-    total_area = db.Column(db.String(20), comment='总面积(㎡)')
-    # total_area_id = db.Column(db.Integer,
-    #                           comment='总面积范围id(1:0-500㎡；2:500-1000㎡；3:1000-2000㎡；4:2000-5000㎡；5:5000-10000㎡)')
-    cover_land_area = db.Column(db.String(20), comment='占地面积(㎡)')
-    # cover_land_area_id = db.Column(db.Integer,
-    #                                comment='占地面积范围id(1:0-500㎡；2:500-1000㎡；3:1000-2000㎡；4:2000-5000㎡；5:5000-10000㎡)')
-    build_type = db.Column(db.String(20), comment='楼宇类型')
-    # build_type_id = db.Column(db.Integer, comment='楼宇类型id(1:商铺；2:写字楼)')
-    rent_rate = db.Column(db.String(20), comment='出租率')
-    # rent_rate_id = db.Column(db.Integer, comment='出租率id(1:0-50％；2:50-80％；3:80-90％；4:90-100％；)')
-    layer_num = db.Column(db.Integer, comment='总层数（层，填写整数）')
-    detail_address = db.Column(db.String(50), comment='详细地址')
-    lng = db.Column(db.String(50), comment='经度')
-    lat = db.Column(db.String(50), comment='维度')
 
-    construction_time = db.Column(db.String(20), default='', comment='建设时间(例如：2022年)')
+# 产业载体-土地数据
+class CarrierLand(db.Model):
+    __tablename_ = "carrier_land"
+    __table_args__ = ({'comment': '产业载体-土地数据表'})
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    land_name = db.Column(db.String(20), comment='土地名称')
+
     upload_time = db.Column(db.DateTime, default='', comment='数据上传时间')
-    # 权限相关
-    upload_people = db.Column(db.String(20), comment='数据上传人')
+    upload_people = db.Column(db.String(20), comment='数据上传人名字')
     upload_people_id = db.Column(db.String(20), comment='数据上传人用户id')
     upload_people_role_id = db.Column(db.String(20), comment='数据上传人权限id')
     upload_people_belong = db.Column(db.String(100), comment='数据上传人所属区县、机构、部门')
-
     fix_time = db.Column(db.DateTime, default='', comment='数据修改时间')
-    fix_people = db.Column(db.String(20), comment='数据修改人')
-    build_status = db.Column(db.String(20), comment='楼宇状态')
-    # rent_money = db.Column(db.String(20), comment='租金（万元）')
-    rent_money = db.Column(db.String(20), comment='租金范围（元/平米/天）')
-    wuye_money = db.Column(db.String(20), comment='物业费（元/平米/天）')
+    fix_people = db.Column(db.String(20), comment='数据修改人名字')
     audit_status = db.Column(db.Integer, comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过')
     audit_message = db.Column(db.String(50), comment='审核附言')
 
-    build_info = db.Column(db.String(255), comment='楼宇介绍')
-    inside_picture_url = db.Column(db.String(255), comment='内部照片url')
-    outer_picture_url = db.Column(db.String(255), comment='外部照片url')
-    price_url = db.Column(db.String(255), comment='平面图url')
-
-    car_space_num = db.Column(db.Integer, comment='车位数（个，填写整数）')
-    lift_num = db.Column(db.Integer, comment='电梯数（部，填写整数）')
-    rentout_status = db.Column(db.String(20), comment='出租状态')
-    linkman = db.Column(db.String(20), comment='联系人')
-    link_mobile = db.Column(db.String(20), comment='联系方式')
-    build_area = db.Column(db.String(20), comment='建筑面积(㎡)')
-
-    empty_area = db.Column(db.String(20), comment='闲置面积(㎡)')
-    build_structure = db.Column(db.String(20), comment='建筑结构')
-    owner = db.Column(db.String(20), comment='权属人')
-    attract_status = db.Column(db.String(20), comment='拟招引状态')
-    attract_industry_status = db.Column(db.String(20), comment='招引业态')
-    cooperation_model = db.Column(db.String(20), comment='合作模式')
-    attract_advantage = db.Column(db.String(255), comment='招商优势')
-    policy = db.Column(db.String(255), comment='优惠政策')
-
-    # settled_company = db.Column(db.String(255), comment='入住企业名称（多个，列表形式，顿号分隔）')
-    # surround_facility = db.Column(db.String(255), comment='周边配套（多个，列表形式，顿号分隔）')
-    # education_name = db.Column(db.String(255), comment='教育机构名称（多个，列表形式，顿号分隔）')
-    # medical_name = db.Column(db.String(255), comment='医疗设施名称（多个，列表形式，顿号分隔）')
-    # park_name = db.Column(db.String(255), comment='大型公园名称（多个，列表形式，顿号分隔）')
-    # shangfu_center = db.Column(db.String(255), comment='商服中心（多个，列表形式，顿号分隔）')
-    # administration_center = db.Column(db.String(255), comment='行政中心（多个，列表形式，顿号分隔）')
-    # transportation = db.Column(db.String(255), comment='交通设施（多个，列表形式，顿号分隔）')
-
-
-# 载体资源库-数据填报-土地详情表
-class CarrierLand(db.Model):
-    __tablename_ = "carrier_land"
-    __table_args__ = ({'comment': '载体资源库-土地详情表'})  # 添加表注释
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
-    district_name = db.Column(db.String(50), comment='区域名称')
-    land_name = db.Column(db.String(50), comment='土地名称')
-    industry_name = db.Column(db.String(255), comment='产业名称')
-    land_nature = db.Column(db.String(20), comment='土地性质)')
-    land_nature_id = db.Column(db.Integer, comment='土地性质id(1:农用地；2:商业用地；3:建设用地；4:旅游用地；5:居民用地。)')
-    detail_address = db.Column(db.String(20), comment='详细地址')
     lng = db.Column(db.String(50), comment='经度')
     lat = db.Column(db.String(50), comment='维度')
-    total_area = db.Column(db.String(20), comment='总面积(㎡)')
-    total_area_id = db.Column(db.Integer,
-                              comment='总面积范围id(1:0-500㎡；2:500-1000㎡；3:1000-2000㎡；4:2000-5000㎡；5:5000-10000㎡)')
-    industry_type = db.Column(db.String(20), comment='产业类型')
-    jing_area = db.Column(db.String(20), comment='净面积(㎡)')
-    transfer_year = db.Column(db.String(20), comment='出让年限（年）')
-    transfer_year_id = db.Column(db.Integer, comment='出让年限范围id(1:0-5年；2:5-10年；3:10-15年；4:15-20年；5:20年以上)')
-
-    land_code = db.Column(db.String(50), comment='土地编码')
+    land_code = db.Column(db.String(20), comment='土地编码')
+    district_name = db.Column(db.String(50), comment='所属县区')
+    development_area = db.Column(db.String(20), comment='所属开发区')
+    detail_address = db.Column(db.String(50), comment='土地位置')
+    land_use = db.Column(db.String(255), comment='用地四至')
+    land_nature = db.Column(db.String(20), comment='用地性质(工业用地/商服用地/物流仓储用地/科研用地/居住用地)（包括用地性质类别代码）')
+    total_area = db.Column(db.String(255), comment='用地面积（净用地面积）（公顷）')
+    surface_area = db.Column(db.String(20), comment='地上控制建面（㎡）')
+    plot_ratio = db.Column(db.String(10), comment='容积率')
+    greening_rate = db.Column(db.String(20), comment='绿化率')
+    density = db.Column(db.String(20), comment='建筑密度')
+    height_permitted = db.Column(db.String(20), comment='限高（㎡）')
+    transfer_year = db.Column(db.String(20), comment='出让年限')
+    develop_degree = db.Column(db.String(20), comment='用地开发程度（请详细描述几通一平）')
+    investment_intensity = db.Column(db.String(20), comment='投资强度（万元/亩）')
+    output_intensity = db.Column(db.String(20), comment='产出强度（万元/亩）')
+    tax = db.Column(db.String(20), comment='地均税收（万元/亩）')
+    linkman = db.Column(db.String(20), comment='联系人')
+    telephone = db.Column(db.String(20), comment='联系方式')
+    red_line_map = db.Column(db.String(20), comment='用地红线图')
+    other_requirements = db.Column(db.String(20), comment='其他要求')
+
+
+# 产业载体-楼宇数据
+class CarrierBuild(db.Model):
+    __tablename_ = "carrier_build"
+    __table_args__ = ({'comment': '产业载体-楼宇数据表'})
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    build_name = db.Column(db.String(20), comment='楼宇名称')
+
+    audit_status = db.Column(db.Integer, comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过')
+    audit_message = db.Column(db.String(50), comment='审核附言')
     upload_time = db.Column(db.DateTime, default='', comment='数据上传时间')
-    upload_people = db.Column(db.String(20), comment='数据上传人名字')
+
+    # 权限相关
+    upload_people = db.Column(db.String(20), comment='数据上传人')
     upload_people_id = db.Column(db.String(20), comment='数据上传人用户id')
     upload_people_role_id = db.Column(db.String(20), comment='数据上传人权限id')
     upload_people_belong = db.Column(db.String(100), comment='数据上传人所属区县、机构、部门')
     fix_time = db.Column(db.DateTime, default='', comment='数据修改时间')
-    fix_people = db.Column(db.String(20), comment='数据修改人名字')
-    land_status = db.Column(db.Integer, comment='土地状态 0为闲置；1为占用')
-    audit_status = db.Column(db.Integer, comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过')
-    audit_message = db.Column(db.String(50), comment='审核附言')
-    attract_status = db.Column(db.String(20), comment='拟招引状态')
+    fix_people = db.Column(db.String(20), comment='数据修改人')
 
+    lng = db.Column(db.String(50), comment='经度')
+    lat = db.Column(db.String(50), comment='维度')
+    district_name = db.Column(db.String(50), comment='所属县区')
+    development_area = db.Column(db.String(50), comment='所属开发区')
+    build_type = db.Column(db.String(20), comment='楼宇类型(商铺/写字楼/其他)')
+    level = db.Column(db.String(255), comment='写字楼等级（甲/乙/其他）')
+    detail_address = db.Column(db.String(20), comment='详细地址（地址需填写准确、详细、精准）')
+    construction_time = db.Column(db.String(20), comment='建成时间（年）')
+    cover_land_area = db.Column(db.String(10), comment='总占地面积（㎡）')
+    build_area = db.Column(db.String(20), comment='总建筑面积（㎡）')
+    single_area = db.Column(db.String(20), comment='单层面积（㎡）')
+    empty_area = db.Column(db.String(20), comment='闲置面积（㎡）')
+    layer_num = db.Column(db.Integer, comment='总层数')
+    car_space_num = db.Column(db.Integer, comment='车位（个）')
+    lift_num = db.Column(db.Integer, comment='电梯（部）')
+    is_water = db.Column(db.String(20), comment='是否已通水(是/否)')
+    is_electric = db.Column(db.String(20), comment='是否已通电(是/否)')
+    is_warm = db.Column(db.String(20), comment='是否已通暖(是/否)')
+    is_gas = db.Column(db.String(20), comment='是否已通燃气(是/否)')
+    is_internet = db.Column(db.String(20), comment='是否已通网络(是/否)')
+    is_divide = db.Column(db.String(20), comment='是否可以分割(是/否)')
+    attract_status = db.Column(db.String(20), comment='拟招引产业')
+    cooperation_model = db.Column(db.String(20), comment='合作模式(出租/出售/转让)')
+    rent_money = db.Column(db.String(20), comment='租金（元/平米/天）')
+    wuye_money = db.Column(db.String(20), comment='物业费（元/平米/月）')
     linkman = db.Column(db.String(20), comment='联系人')
     link_mobile = db.Column(db.String(20), comment='联系方式')
-    land_info = db.Column(db.String(255), comment='土地介绍')
-    inside_picture_url = db.Column(db.String(255), comment='内部照片url')
-    outer_picture_url = db.Column(db.String(255), comment='外部照片url')
-    plot_ratio = db.Column(db.String(20), comment='容积率')
-    sales_price = db.Column(db.String(20), comment='销售均价（毛坯）（万元）')
-    max_sales_price = db.Column(db.String(20), comment='最高销售单价（万元）')
-    max_car_space_price = db.Column(db.String(20), comment='车位最高销售单价')
-    plan_target = db.Column(db.String(20), comment='规划指标')
-    plan_condition = db.Column(db.String(20), comment='规划条件')
-    price_url = db.Column(db.String(255), comment='规划图url')
-
-    surround_facility = db.Column(db.String(255), comment='周边配套（多个，列表形式，顿号分隔）')
-    education_name = db.Column(db.String(255), comment='教育机构名称（多个，列表形式，顿号分隔）')
-    medical_name = db.Column(db.String(255), comment='医疗设施名称（多个，列表形式，顿号分隔）')
-    park_name = db.Column(db.String(255), comment='大型公园名称（多个，列表形式，顿号分隔）')
-    shangfu_center = db.Column(db.String(255), comment='商服中心（多个，列表形式，顿号分隔）')
-    administration_center = db.Column(db.String(255), comment='行政中心（多个，列表形式，顿号分隔）')
-    policy = db.Column(db.String(255), comment='相关政策（多个，列表形式，顿号分隔）')
-
-
-# 载体资源库-数据填报-厂房详情表
+    build_pic = db.Column(db.String(20), comment='楼宇图片')
+
+
+# 产业载体-厂房数据
 class CarrierFactory(db.Model):
     __tablename_ = "carrier_factory"
-    __table_args__ = ({'comment': '载体资源库-厂房详情表'})  # 添加表注释
-    id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
-    district_name = db.Column(db.String(50), comment='区域名称')
-    factory_name = db.Column(db.String(50), comment='厂房名称')
-    # is_standard = db.Column(db.Integer, comment='是否为标准化厂房(是1否0)')
-    # rent_status = db.Column(db.Integer, comment='是否对外租赁(是1否0)')
-    is_standard = db.Column(db.String(10), comment='是否为标准化厂房(是或否)')
-    rent_status = db.Column(db.String(10), comment='是否对外租赁(是或否)')
-    # rent_money = db.Column(db.String(20), comment='租金（万元）')
-    rent_money = db.Column(db.String(20), comment='租金范围（元/平米/天）')
-    detail_address = db.Column(db.String(20), comment='详细地址')
-    factory_area = db.Column(db.String(20), comment='建筑面积(㎡)')
-    cover_land_area = db.Column(db.String(20), comment='占地面积(㎡)')
-    cover_land_area_id = db.Column(db.Integer,
-                                   comment='占地面积范围id(1:0-500㎡；2:500-1000㎡；3:1000-2000㎡；4:2000-5000㎡；5:5000-10000㎡)')
-    industry_name = db.Column(db.String(255), comment='产业名称')
-    property_type = db.Column(db.String(50), comment='产权类型')
-
-    construction_time = db.Column(db.String(20), default='', comment='建设时间(例如：2022年)')
+    __table_args__ = ({'comment': '产业载体-厂房数据表'})
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    factory_name = db.Column(db.String(20), comment='厂房名称')
+    lng = db.Column(db.String(50), comment='经度')
+    lat = db.Column(db.String(50), comment='维度')
+    district_name = db.Column(db.String(50), comment='所属县区')
+    development_area = db.Column(db.String(50), comment='所属开发区')
+    build_type = db.Column(db.String(20), comment='厂房类型（单层/多层/混合层）')
+    is_standard = db.Column(db.String(20), comment='是否标准化厂房(是/否)')
+    detail_address = db.Column(db.String(50), comment='详细地址（地址需填写准确、详细、精准）')
+    construction_time = db.Column(db.String(20), comment='建成时间（年）')
+    cover_land_area = db.Column(db.String(20), comment='总占地面积（㎡）')
+    factory_area = db.Column(db.String(255), comment='总建筑面积（㎡）')
+    empty_area = db.Column(db.String(20), comment='闲置面积（㎡）')
+    layer_num = db.Column(db.String(20), comment='总层数')
+    factory_structure = db.Column(db.String(20), comment='建筑结构（混凝土框架、钢结构、砖混、砖混钢筋、钢筋混凝土、轻钢）')
+    width = db.Column(db.String(10), comment='跨度（m）')
+    high = db.Column(db.String(20), comment='层高（m）')
+    bearing = db.Column(db.String(20), comment='承重（kg/㎡）')
+    is_water = db.Column(db.String(20), comment='是否已通水(是/否)')
+    is_electric = db.Column(db.String(20), comment='是否已通电(是/否)')
+    is_warm = db.Column(db.String(20), comment='是否已通暖(是/否)')
+    is_gas = db.Column(db.String(20), comment='是否已通燃气(是/否)')
+    is_network = db.Column(db.String(20), comment='是否已通网络(是/否)')
+    is_car = db.Column(db.String(20), comment='是否可安装天车')
+    lift_num = db.Column(db.String(20), comment='电梯(部)')
+    attract_status = db.Column(db.String(20), comment='拟招引产业（下拉筛选）')
+    settled_enterprise = db.Column(db.String(20), comment='已入驻企业（企业全称，使用面积）')
+    cooperation_model = db.Column(db.String(20), comment='合作模式(出租/出售/转让)')
+    rent_money = db.Column(db.String(20), comment='租金（元/平米/天）')
+    linkman = db.Column(db.String(20), comment='联系人')
+    link_mobile = db.Column(db.String(20), comment='联系方式')
+
+    price_url = db.Column(db.String(255), comment='厂房图片url')
     upload_time = db.Column(db.DateTime, default='', comment='数据上传时间')
     upload_people = db.Column(db.String(20), comment='数据上传人名字')
     upload_people_id = db.Column(db.String(20), comment='数据上传人用户id')
@@ -1801,53 +1880,8 @@ class CarrierFactory(db.Model):
 
     fix_time = db.Column(db.DateTime, default='', comment='数据修改时间')
     fix_people = db.Column(db.String(20), comment='数据修改人名字')
-    factory_status = db.Column(db.String(50), comment='厂房状态')
     audit_status = db.Column(db.String(20), comment='审核状态 0为未审核；1为审核通过；2为提交；3为驳回；4未通过；')
     audit_message = db.Column(db.String(50), comment='审核附言')
-    lng = db.Column(db.String(50), comment='经度')
-    lat = db.Column(db.String(50), comment='维度')
-    factory_info = db.Column(db.String(255), comment='厂房介绍')
-    inside_picture_url = db.Column(db.String(255), comment='内部照片url')
-    outer_picture_url = db.Column(db.String(255), comment='外部照片url')
-    price_url = db.Column(db.String(255), comment='平面图url')
-
-    # owner = db.Column(db.String(20), comment='权属人')
-    empty_area = db.Column(db.String(20), comment='闲置面积(㎡)')
-    factory_structure = db.Column(db.String(20), comment='建筑结构')
-    width = db.Column(db.String(20), comment='跨度（米）')
-    high = db.Column(db.String(20), comment='层高（米）')
-    bearing = db.Column(db.String(20), comment='承重（500kg/m2）')
-    linkman = db.Column(db.String(20), comment='联系人')
-    link_mobile = db.Column(db.String(20), comment='联系方式')
-    # is_electric = db.Column(db.Integer, comment='是否已通电(是1否0,填写整数)')
-    # is_water = db.Column(db.Integer, comment='是否已通水(是1否0,填写整数)')
-    # is_warm = db.Column(db.Integer, comment='是否已通暖(是1否0,填写整数)')
-    # is_gas = db.Column(db.Integer, comment='是否已通燃气(是1否0,填写整数)')
-    # is_network = db.Column(db.Integer, comment='是否已通网络(是1否0,填写整数)')
-    # is_lift = db.Column(db.Integer, comment='是否有电梯(是1否0)')
-    is_electric = db.Column(db.String(10), comment='是否已通电(是或否)')
-    is_water = db.Column(db.String(10), comment='是否已通水(是或否)')
-    is_warm = db.Column(db.String(10), comment='是否已通暖(是或否)')
-    is_gas = db.Column(db.String(10), comment='是否已通燃气(是或否)')
-    is_network = db.Column(db.String(10), comment='是否已通网络(是或否)')
-    is_lift = db.Column(db.String(10), comment='是否有电梯(是或否)')
-    lift_num = db.Column(db.Integer, comment='电梯数量（部,填写整数）')
-    is_car_space = db.Column(db.Integer, comment='是否有车位(是1否0)')
-    # car_space_num = db.Column(db.Integer, comment='车位数（个,填写整数）')
-    layer_num = db.Column(db.Integer, comment='总层数（层,填写整数）')
-    attract_status = db.Column(db.String(20), comment='拟招引状态')
-    cooperation_model = db.Column(db.String(20), comment='合作模式')
-    attract_advantage = db.Column(db.String(255), comment='招商优势')
-    policy = db.Column(db.String(255), comment='相关政策')
-    # settled_company = db.Column(db.String(255), comment='入住企业名称（多个，列表形式，顿号分隔）')
-    # surround_facility = db.Column(db.String(255), comment='周边配套（多个，列表形式，顿号分隔）')
-    # education_name = db.Column(db.String(255), comment='教育机构名称（多个，列表形式，顿号分隔）')
-    # medical_name = db.Column(db.String(255), comment='医疗设施名称（多个，列表形式，顿号分隔）')
-    # park_name = db.Column(db.String(255), comment='大型公园名称（多个，列表形式，顿号分隔）')
-    # shangfu_center = db.Column(db.String(255), comment='商服中心（多个，列表形式，顿号分隔）')
-    # administration_center = db.Column(db.String(255), comment='行政中心（多个，列表形式，顿号分隔）')
-    # transportation = db.Column(db.String(255), comment='交通设施（多个，列表形式，顿号分隔）')
-
 
 # 载体资源库-产业地图-各载体类型面积数据表
 # class CarrierArea(db.Model):

apps/view_atlas/view.py

@@ -462,17 +462,15 @@ def get_data(name, industry_level, select_flag, page, perpage):
     try:
         if select_flag in [1, 2, 7]:  # 当选择行政区/园区时
             induzone = ''
+            size = ''
             if select_flag == 1 and industry_level == 1:  # 当选择的是父产业的行政区时
                 induzone = Induzone.query.filter(Induzone.cate.like('行政区'), Induzone.navigat.like("%{}%".format(name)))
-            # elif select_flag == 1 and industry_level == 2:  # 当选择的是子产业的行政区时
-            #     induzone = Induzone.query.filter(Induzone.cate.like('行政区'), Induzone.navigat.like("%{}%".format(name)))
+                size = induzone.count()  # 分页总数
             elif select_flag == 2 and industry_level == 1:  # 当选择的是父产业的园区时
                 induzone = Induzone.query.filter(Induzone.cate.like('产业园区'), Induzone.navigat.like("%{}%".format(name)))
-            # elif select_flag == 2 and industry_level == 2:  # 当选择的是子产业的园区时
-            #     induzone = Induzone.query.filter(Induzone.cate.like('产业园区'), Induzone.navigat.like("%{}%".format(name)))
+                size = induzone.count()  # 分页总数
             elif select_flag == 7 and industry_level == 1:  # 当选择的是开发区时
                 induzone = Induzone.query.filter(Induzone.cate.like('开发区'), Induzone.navigat.like("%{}%".format(name)))
-
                 size = induzone.count()  # 分页总数
             induzone = induzone.paginate(page, perpage).items
 
@@ -506,69 +504,69 @@ def get_data(name, industry_level, select_flag, page, perpage):
                                "size": size}
                 return garden_data
 
-        if select_flag == 3:  # 当选择载体土地时
-            if industry_level == 1:  # 当选择的是父产业时
-                land = ZaitiLand.query.filter(ZaitiLand.navigator.like("%{}%".format(name)))
-            else:
-                land = ZaitiLand.query.filter(ZaitiLand.navigat.like("%{}%".format(name)))
-            size = land.count()  # 分页总数
-            land = land.paginate(page, perpage).items
-
-            # 封装土地数据
-            land_data = {"land_data": [{
-                "id": i.id,
-                "name": i.name,
-                "num": i.num,
-                "nature": i.nature,
-                "acreage": i.acreage,
-                "industry_type": i.industry_type,
-                "telephone": i.telephone
-            } for i in land], "size": size}
-            return land_data
-
-        if select_flag == 4:  # 当选择载体楼宇时
-            if industry_level == 1:  # 当选择的是父产业时
-                build = ZaitiBuild.query.filter(ZaitiBuild.navigator.like("%{}%".format(name)))
-            else:
-                build = ZaitiBuild.query.filter(ZaitiBuild.navigat.like("%{}%".format(name)))
-            size = build.count()  # 分页总数
-            build = build.paginate(page, perpage).items
-
-            # 封装楼宇数据
-            build_data = {
-                "build_data": [{
-                    "id": i.id,
-                    "name": i.name,
-                    "acreage": i.acreage,
-                    "buide_type": i.buide_type,
-                    "industry_type": i.industry_type,
-                    "telephone": i.telephone,
-                    "addr": i.addr,
-                } for i in build], "size": size
-            }
-            return build_data
-
-        if select_flag == 5:  # 当选择载体厂房时
-            if industry_level == 1:  # 当选择的是父产业时
-                factory = ZaitiFactory.query.filter(ZaitiFactory.navigator.like("%{}%".format(name)))
-            else:
-                factory = ZaitiFactory.query.filter(ZaitiFactory.navigat.like("%{}%".format(name)))
-            size = factory.count()  # 分页总数
-            factory = factory.paginate(page, perpage).items
-
-            # 封装楼宇数据
-            factory_data = {
-                "factory_data": [{
-                    "id": i.id,
-                    "name": i.name,
-                    "acreage": i.acreage,
-                    "factory_type": i.factory_type,
-                    "industry_type": i.industry_type,
-                    "telephone": i.telephone,
-                    "addr": i.addr,
-                } for i in factory], "size": size
-            }
-            return factory_data
+        # if select_flag == 3:  # 当选择载体土地时
+        #     if industry_level == 1:  # 当选择的是父产业时
+        #         land = ZaitiLand.query.filter(ZaitiLand.navigator.like("%{}%".format(name)))
+        #     else:
+        #         land = ZaitiLand.query.filter(ZaitiLand.navigat.like("%{}%".format(name)))
+        #     size = land.count()  # 分页总数
+        #     land = land.paginate(page, perpage).items
+        #
+        #     # 封装土地数据
+        #     land_data = {"land_data": [{
+        #         "id": i.id,
+        #         "name": i.name,
+        #         "num": i.num,
+        #         "nature": i.nature,
+        #         "acreage": i.acreage,
+        #         "industry_type": i.industry_type,
+        #         "telephone": i.telephone
+        #     } for i in land], "size": size}
+        #     return land_data
+        #
+        # if select_flag == 4:  # 当选择载体楼宇时
+        #     if industry_level == 1:  # 当选择的是父产业时
+        #         build = ZaitiBuild.query.filter(ZaitiBuild.navigator.like("%{}%".format(name)))
+        #     else:
+        #         build = ZaitiBuild.query.filter(ZaitiBuild.navigat.like("%{}%".format(name)))
+        #     size = build.count()  # 分页总数
+        #     build = build.paginate(page, perpage).items
+        #
+        #     # 封装楼宇数据
+        #     build_data = {
+        #         "build_data": [{
+        #             "id": i.id,
+        #             "name": i.name,
+        #             "acreage": i.acreage,
+        #             "buide_type": i.buide_type,
+        #             "industry_type": i.industry_type,
+        #             "telephone": i.telephone,
+        #             "addr": i.addr,
+        #         } for i in build], "size": size
+        #     }
+        #     return build_data
+        #
+        # if select_flag == 5:  # 当选择载体厂房时
+        #     if industry_level == 1:  # 当选择的是父产业时
+        #         factory = ZaitiFactory.query.filter(ZaitiFactory.navigator.like("%{}%".format(name)))
+        #     else:
+        #         factory = ZaitiFactory.query.filter(ZaitiFactory.navigat.like("%{}%".format(name)))
+        #     size = factory.count()  # 分页总数
+        #     factory = factory.paginate(page, perpage).items
+        #
+        #     # 封装楼宇数据
+        #     factory_data = {
+        #         "factory_data": [{
+        #             "id": i.id,
+        #             "name": i.name,
+        #             "acreage": i.acreage,
+        #             "factory_type": i.factory_type,
+        #             "industry_type": i.industry_type,
+        #             "telephone": i.telephone,
+        #             "addr": i.addr,
+        #         } for i in factory], "size": size
+        #     }
+        #     return factory_data
     except Exception as e:
         # print(e)
         current_app.logger.error(e)
@@ -957,59 +955,59 @@ def get_zaiti_detail_data():
         except Exception as e:
             current_app.logger.error(e)
 
-    if cate_id == 3:
-        try:
-            land = ZaitiLand.query.filter_by(id=id).first()
-            data = {
-                "num": land.num,  # 编号
-                "name": land.name,  # 地块名称
-                "addr": land.addr,  # 地址
-                "nature": land.nature,  # 土地性质
-                "acreage": land.acreage,  # 面积
-                "target": land.target,  # 规划指标
-                "age_limit": land.age_limit,  # 出让年限
-                "industry_type": land.industry_type,  # 产业类型
-                "telephone": land.telephone  # 电话
-            }
-            return jsonify(code=RET.OK, msg='土地详情查询成功！', data=data)
-        except Exception as e:
-            current_app.logger.error(e)
-
-    if cate_id == 4:
-        try:
-            build = ZaitiBuild.query.filter_by(id=id).first()
-            data = {
-                "name": build.name,  # 楼宇名称
-                "addr": build.addr,  # 地址
-                "acreage": build.acreage,  # 面积
-                "buide_type": build.buide_type,  # 楼宇类型
-                "industry_type": build.industry_type,  # 产业类型
-                "rate": build.rate,  # 出租率
-                "telephone": build.telephone  # 电话
-            }
-            return jsonify(code=RET.OK, msg='楼宇详情查询成功！', data=data)
-        except Exception as e:
-            current_app.logger.error(e)
-
-    if cate_id == 5:
-        try:
-            factory = ZaitiFactory.query.filter_by(id=id).first()
-            data = {
-                "name": factory.name,  # 厂房名称
-                "addr": factory.addr,  # 地址
-                "acreage": factory.acreage,  # 面积
-                "structure": factory.structure,  # 简介
-                "height": factory.height,  # 高度
-                "bearing": factory.bearing,  # 承重
-                "new_level": factory.new_level,  # 新旧程度
-                "other": factory.other,  # 其他
-                "industry_type": factory.industry_type,  # 产业类型
-                "factory_type": factory.factory_type,  # 厂房类型
-                "telephone": factory.telephone,  # 电话
-            }
-            return jsonify(code=RET.OK, msg='厂房详情查询成功！', data=data)
-        except Exception as e:
-            current_app.logger.error(e)
+    # if cate_id == 3:
+    #     try:
+    #         land = ZaitiLand.query.filter_by(id=id).first()
+    #         data = {
+    #             "num": land.num,  # 编号
+    #             "name": land.name,  # 地块名称
+    #             "addr": land.addr,  # 地址
+    #             "nature": land.nature,  # 土地性质
+    #             "acreage": land.acreage,  # 面积
+    #             "target": land.target,  # 规划指标
+    #             "age_limit": land.age_limit,  # 出让年限
+    #             "industry_type": land.industry_type,  # 产业类型
+    #             "telephone": land.telephone  # 电话
+    #         }
+    #         return jsonify(code=RET.OK, msg='土地详情查询成功！', data=data)
+    #     except Exception as e:
+    #         current_app.logger.error(e)
+
+    # if cate_id == 4:
+    #     try:
+    #         build = ZaitiBuild.query.filter_by(id=id).first()
+    #         data = {
+    #             "name": build.name,  # 楼宇名称
+    #             "addr": build.addr,  # 地址
+    #             "acreage": build.acreage,  # 面积
+    #             "buide_type": build.buide_type,  # 楼宇类型
+    #             "industry_type": build.industry_type,  # 产业类型
+    #             "rate": build.rate,  # 出租率
+    #             "telephone": build.telephone  # 电话
+    #         }
+    #         return jsonify(code=RET.OK, msg='楼宇详情查询成功！', data=data)
+    #     except Exception as e:
+    #         current_app.logger.error(e)
+
+    # if cate_id == 5:
+    #     try:
+    #         factory = ZaitiFactory.query.filter_by(id=id).first()
+    #         data = {
+    #             "name": factory.name,  # 厂房名称
+    #             "addr": factory.addr,  # 地址
+    #             "acreage": factory.acreage,  # 面积
+    #             "structure": factory.structure,  # 简介
+    #             "height": factory.height,  # 高度
+    #             "bearing": factory.bearing,  # 承重
+    #             "new_level": factory.new_level,  # 新旧程度
+    #             "other": factory.other,  # 其他
+    #             "industry_type": factory.industry_type,  # 产业类型
+    #             "factory_type": factory.factory_type,  # 厂房类型
+    #             "telephone": factory.telephone,  # 电话
+    #         }
+    #         return jsonify(code=RET.OK, msg='厂房详情查询成功！', data=data)
+    #     except Exception as e:
+    #         current_app.logger.error(e)
 
 
 """以下202212月改版后需求"""

apps/view_choose/choose_view.py

@@ -96,7 +96,7 @@ def global_region(industry_id, preference, key_words, district_name, page, per_p
         return data
 
 
-# 厂房公共方法
+# 土地公共方法
 def global_land(key_words, district_name, land_name, land_nature, industry_name, page, per_page):
     try:
         if key_words:
@@ -199,7 +199,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
         return data
 
 
-# 土地公共方法
+# 楼宇公共方法
 def global_build(key_words, district_name, build_name, industry_name, build_type, page, per_page):
     try:
         if key_words:

apps/view_choose/fill_data.py

@@ -254,7 +254,7 @@ def download_xlsx():
         return jsonify(code=RET.PARAMERR, msg="参数不能为空！")
 
     if template_type == 1:  # 楼宇的模板标识
-        build_template = "http://39.100.39.50:8009/aaa_statics/carrier_template/可利用楼宇情况统计表.xlsx"
+        build_template = "http://39.100.39.50:8008/aaa_statics/carrier_template/楼宇信息表.xlsx"
         operation_message = "进行了下载楼宇数据模板操作"
         upload_time = datetime.now()
         log = OperationLog(read_type=0, operation_people_id=user_id, operation_people_belong=belong_unit, operation_time=upload_time,
@@ -265,7 +265,7 @@ def download_xlsx():
         return build_template
 
     if template_type == 2:  # 土地的模板标识
-        land_template = "http://39.100.39.50:8009/aaa_statics/carrier_template/可利用土地情况统计表.xlsx"
+        land_template = "http://39.100.39.50:8008/aaa_statics/carrier_template/土地信息表.xlsx"
         operation_message = "进行了下载土地数据模板操作"
         upload_time = datetime.now()
         log = OperationLog(read_type=0, operation_people_id=user_id, operation_people_belong=belong_unit, operation_time=upload_time,
@@ -276,8 +276,8 @@ def download_xlsx():
         return land_template
 
     if template_type == 3:  # 厂房的模板标识
-        # factory_template = "http://39.100.39.50:8009/aaa_statics/carrier_template/carrier_factory.xlsx"
-        factory_template = "http://39.100.39.50:8009/aaa_statics/carrier_template/可利用厂房情况统计表.xlsx"
+        # factory_template = "http://39.100.39.50:8008/aaa_statics/carrier_template/carrier_factory.xlsx"
+        factory_template = "http://39.100.39.50:8008/aaa_statics/carrier_template/厂房信息表.xlsx"
         operation_message = "进行了下载厂房数据模板操作"
         upload_time = datetime.now()
         log = OperationLog(read_type=0, operation_people_id=user_id, operation_people_belong=belong_unit, operation_time=upload_time,
@@ -385,7 +385,6 @@ def get_jwd(address):
 @api_address.route("/UploadCarrierData", methods=["POST"])
 def read_template():
     # 获取上传的文件
-    # token = request.form['token']
     token = request.headers['token']
     action_name = '批量导入'
     try:
@@ -399,7 +398,7 @@ def read_template():
     # 上传的文件
     file = request.files['file']
     print(file.filename)  # 打印文件名
-    if '可利用' not in file.filename or '统计表' not in file.filename:
+    if '信息表' not in file.filename:
         return jsonify(code=RET.DBERR, msg="导入失败！请检查模板格式以及文件名！")
     try:
         f = file.read()  # 文件内容
@@ -448,10 +447,13 @@ def read_template():
                 rep_num += 1
                 rep_build_name_list.append(carrier_name)
                 continue
-            build_type = row_content[2]
+
+            development_area = row_content[2]
+            build_type = row_content[3]
+            level = row_content[4]
 
             # 详细地址 是必填项，用来获取经纬度
-            detail_address = row_content[3]
+            detail_address = row_content[5]
             if not detail_address:
                 return jsonify(code=RET.DATAERR, msg='上传失败！详细地址不能为空，要尽量详细，用来获取经纬度')
             # 根据详细地址获取经纬度
@@ -459,33 +461,38 @@ def read_template():
             if code == 1:
                 return jsonify(code=RET.DATAERR, msg=carrier_name + msg)
 
-            construction_time = row_content[4]
-            cover_land_area = row_content[5]
-            build_area = row_content[6]
-            empty_area = row_content[7]
+            construction_time = row_content[6]
+            cover_land_area = row_content[7]
+            build_area = row_content[8]
+            layer_area = row_content[9]
+            empty_area = row_content[10]
             if not all([is_number(build_area) and is_number(
                     empty_area) and is_number(cover_land_area)]):
                 return jsonify(code=RET.DATAERR, msg='上传失败！面积相关字段格式不正确，请填写数字')
-            layer_num = row_content[8]
-            car_space_num = row_content[9]
-            lift_num = row_content[10]
+            layer_num = row_content[11]
+            car_space_num = row_content[12]
+            lift_num = row_content[13]
+            is_water = row_content[14]
+            is_electric = row_content[15]
+            is_warm = row_content[16]
+            is_gas = row_content[17]
+            is_internet = row_content[18]
+            is_divide = row_content[19]
+
             if not is_number(layer_num) and not is_number(car_space_num) and not is_number(lift_num):
                 return jsonify(code=RET.DATAERR, msg='上传失败！"楼层数" 或者 "电梯数" 或者 "车位数" 格式不正确，请填写整数或置空')
-            attract_status = row_content[11]
-            cooperation_model = row_content[12]
-            rent_money = row_content[13]
-            wuye_money = row_content[14]
+            attract_status = row_content[20]
+            cooperation_model = row_content[21]
+            rent_money = row_content[22]
+            wuye_money = row_content[23]
             # 联系人
-            linkman = row_content[15]
-            link_mobile = row_content[16]
+            linkman = row_content[24]
+            link_mobile = row_content[25]
             if not is_number(link_mobile):
                 return jsonify(code=RET.DATAERR, msg='上传失败！电话号码格式不正确，请填写数字')
-            # if link_mobile:
-            #     link_mobile = str(delete_extra_zero(eval(str(link_mobile))))
-            #     if not re.match(r"1[23456789]\d{9}$", link_mobile):
-            #         return jsonify(code=RET.PARAMERR, msg="上传失败！电话号码格式不正确，请修改！")
-            attract_advantage = row_content[17]
-            policy = row_content[18]
+            # attract_advantage = row_content[17]
+            # policy = row_content[18]
+
         # 导入土地数据
         if carrier_type == '2':
             row_content = row_list[i]
@@ -504,20 +511,36 @@ def read_template():
                 return jsonify(code=RET.DATAERR, msg='上传失败！所属区域或者土地名称不能为空。')
             # district_name = get_district(district_name)
 
-            land_nature = row_content[3]
-            total_area = row_content[4]
+            development_area = row_content[3]
+            detail_address = row_content[4]
+            land_use = row_content[5]
+            land_nature = row_content[6]
+            total_area = row_content[7]
             if not is_number(total_area):
                 return jsonify(code=RET.DATAERR, msg='上传失败！面积相关字段格式不正确，请填写数字')
 
             # 详细地址 是必填项，用来获取经纬度
-            detail_address = row_content[5]
+            # detail_address = row_content[5]
             if not detail_address:
                 return jsonify(code=RET.DATAERR, msg='上传失败！详细地址不能为空，要尽量详细，用来获取经纬度')
             # 根据详细地址获取经纬度
             lng, lat, code, msg = get_jwd(detail_address)
             if code == 1:
                 return jsonify(code=RET.DATAERR, msg=carrier_name + msg)
-
+            surface_area = row_content[8]
+            plot_ratio = row_content[9]
+            greening_rate = row_content[10]
+            density = row_content[11]
+            height_permitted = row_content[12]
+            transfer_year = row_content[13]
+            develop_degree = row_content[14]
+            investment_intensity = row_content[15]
+            output_intensity = row_content[16]
+            tax = row_content[17]
+            linkman = row_content[18]
+            telephone = row_content[19]
+            red_line_map = row_content[20]
+            other_requirements = row_content[21]
         # 导入厂房数据
         if carrier_type == '3':
             row_content = row_list[i]
@@ -528,6 +551,7 @@ def read_template():
             if not any([district_name, carrier_name]):
                 return jsonify(code=RET.DATAERR, msg='上传失败！所属区域或者厂房名称不能为空。')
             # district_name = get_district(district_name)
+            development_area = row_content[2]
 
             # 判断该厂房是否已经存在
             factory_obj = CarrierFactory.query.filter_by(factory_name=carrier_name).first()
@@ -535,29 +559,30 @@ def read_template():
                 rep_num += 1
                 rep_build_name_list.append(carrier_name)
                 continue
-            is_standard = row_content[2]
+            build_type = row_content[3]
+            is_standard = row_content[4]
             # 详细地址 是必填项，用来获取经纬度
-            detail_address = row_content[3]
+            detail_address = row_content[5]
             if not detail_address:
                 return jsonify(code=RET.DATAERR, msg='上传失败！详细地址不能为空，要尽量详细，用来获取经纬度')
             # 根据详细地址获取经纬度
             lng, lat, code, msg = get_jwd(detail_address)
             if code == 1:
                 return jsonify(code=RET.DATAERR, msg=carrier_name + msg)
-            construction_time = row_content[4]
-            cover_land_area = row_content[5]
-            factory_area = row_content[6]
-            empty_area = row_content[7]
-            layer_num = row_content[8]
-            factory_structure = row_content[9]
-            width = row_content[10]
-            high = row_content[11]
-            bearing = row_content[12]
-            is_water = row_content[13]
-            is_electric = row_content[14]
-            is_warm = row_content[15]
-            is_gas = row_content[16]
-            is_network = row_content[17]
+            construction_time = row_content[6]
+            cover_land_area = row_content[7]
+            factory_area = row_content[8]
+            empty_area = row_content[9]
+            layer_num = row_content[10]
+            factory_structure = row_content[11]
+            width = row_content[12]
+            high = row_content[13]
+            bearing = row_content[14]
+            is_water = row_content[15]
+            is_electric = row_content[16]
+            is_warm = row_content[17]
+            is_gas = row_content[18]
+            is_network = row_content[19]
             # 判断电气热暖是否按备注填写0或1
             # if is_electric not in ['', 0.0, 1.0, '1', '0'] or is_water not in ['', 0.0, 1.0, '1',
             #                                                                    '0'] or is_warm not in ['', 0.0, 1.0,
@@ -572,28 +597,31 @@ def read_template():
                     is_network not in ['', '是', '否']:
                 return jsonify(code=RET.DATAERR, msg='上传失败！电气热暖相关字段格式不正确，请按备注填写是或否或置空！')
 
-            lift_num = row_content[18]
+            is_car = row_content[20]
+            lift_num = row_content[21]
             if lift_num and not is_number(lift_num):
                 return jsonify(code=RET.DATAERR, msg='上传失败！电梯数格式不正确，请填写数字，没有的话置空！')
-            attract_status = row_content[19]
-            cooperation_model = row_content[20]
-            rent_money = row_content[21]
-            linkman = row_content[22]
-            link_mobile = row_content[23]
+            attract_status = row_content[22]
+            settled_enterprise = row_content[23]
+            cooperation_model = row_content[24]
+            rent_money = row_content[25]
+            linkman = row_content[26]
+            link_mobile = row_content[27]
             if not is_number(link_mobile):
                 return jsonify(code=RET.DATAERR, msg='上传失败！电话号码格式不正确，请填写数字')
             # if link_mobile:
             #     link_mobile = str(delete_extra_zero(eval(str(link_mobile))))
             #     if not re.match(r"1[23456789]\d{9}$", link_mobile):
             #         return jsonify(code=RET.PARAMERR, msg="上传失败！电话号码格式不正确，请修改！")
-            attract_advantage = row_content[24]
-            policy = row_content[25]
+            # attract_advantage = row_content[24]
+            # policy = row_content[25]
 
         try:
             # 写入数据库
             if carrier_type == '1':
                 name = '楼宇'
-                carrier_obj = CarrierBuild(district_name=district_name, build_name=carrier_name,
+                carrier_obj = CarrierBuild(
+                    district_name=district_name, build_name=carrier_name,
                     build_type=build_type,
                     detail_address=detail_address, construction_time=construction_time,
                     cover_land_area=cover_land_area, build_area=build_area,
@@ -601,10 +629,17 @@ def read_template():
                     layer_num=layer_num, car_space_num=car_space_num, lift_num=lift_num,
                     attract_status=attract_status, cooperation_model=cooperation_model,
                     rent_money=rent_money, wuye_money=wuye_money, linkman=linkman,
-                                           link_mobile=link_mobile, attract_advantage=attract_advantage, policy=policy,
+                    link_mobile=link_mobile,
+
                     audit_status=audit_status, upload_time=upload_time,
                     upload_people=user_name, upload_people_belong=belong_unit,
                     upload_people_id=user_id, upload_people_role_id='', lng=lng, lat=lat,
+
+                    development_area=development_area,
+                    level=level,
+                    single_area=layer_area,
+                    is_internet=is_internet,
+                    is_divide=is_divide
                    )
                 db.session.add(carrier_obj)
                 db.session.commit()
@@ -618,7 +653,23 @@ def read_template():
                                           audit_status=audit_status, upload_time=upload_time,
                                           upload_people=user_name, upload_people_belong=belong_unit,
                                           upload_people_id=user_id, upload_people_role_id='',
-                                          lng=lng, lat=lat
+                                          lng=lng, lat=lat,
+                                          land_use=land_use,
+                                          development_area=development_area,
+                                          surface_area=surface_area,
+                                          plot_ratio=plot_ratio,
+                                          greening_rate=greening_rate,
+                                          density=density,
+                                          height_permitted=height_permitted,
+                                          transfer_year=transfer_year,
+                                          develop_degree=develop_degree,
+                                          investment_intensity=investment_intensity,
+                                          output_intensity=output_intensity,
+                                          tax=tax,
+                                          linkman=linkman,
+                                          telephone=telephone,
+                                          red_line_map=red_line_map,
+                                          other_requirements=other_requirements,
                                           )
                 db.session.add(carrier_obj)
                 db.session.commit()
@@ -635,11 +686,14 @@ def read_template():
                                              is_warm=is_warm, is_gas=is_gas, is_network=is_network, lift_num=lift_num,
                                              attract_status=attract_status, cooperation_model=cooperation_model,
                                              rent_money=rent_money, linkman=linkman, link_mobile=link_mobile,
-                                             attract_advantage=attract_advantage, policy=policy,
                                              audit_status=audit_status, upload_time=upload_time,
                                              upload_people=user_name, upload_people_belong=belong_unit,
                                              upload_people_id=user_id, upload_people_role_id='',
-                                             lng=lng, lat=lat
+                                             lng=lng, lat=lat,
+                                             build_type=build_type,
+                                             is_car=is_car,
+                                             settled_enterprise=settled_enterprise,
+                                             development_area=development_area
                                              )
                 db.session.add(carrier_obj)
                 db.session.commit()
@@ -717,54 +771,91 @@ def batch_export_build():
             # 提取数据，写入xslx表格
             data_list = []
             carrier_name = carrier_obj.build_name
+
             data_list.append(carrier_name)
             district_name = carrier_obj.district_name
             data_list.append(district_name)
+
+            development_area = carrier_obj.development_area
+            data_list.append(development_area)
+
             build_type = carrier_obj.build_type
             data_list.append(build_type)
+
+            level = carrier_obj.level
+            data_list.append(level)
+
             detail_address = carrier_obj.detail_address
             data_list.append(detail_address)
+
             construction_time = carrier_obj.construction_time
             data_list.append(construction_time)
+
             cover_land_area = carrier_obj.cover_land_area
             data_list.append(cover_land_area)
+
             build_area = carrier_obj.build_area
             data_list.append(build_area)
+
+            single_area = carrier_obj.single_area
+            data_list.append(single_area)
+
             empty_area = carrier_obj.empty_area
             data_list.append(empty_area)
+
             layer_num = carrier_obj.layer_num
             data_list.append(layer_num)
+
             car_space_num = carrier_obj.car_space_num
             data_list.append(car_space_num)
+
             lift_num = carrier_obj.lift_num
             data_list.append(lift_num)
+
+            is_water = carrier_obj.is_water
+            data_list.append(is_water)
+            is_electric = carrier_obj.is_electric
+            data_list.append(is_electric)
+            is_warm = carrier_obj.is_warm
+            data_list.append(is_warm)
+            is_gas = carrier_obj.is_gas
+            data_list.append(is_gas)
+            is_internet = carrier_obj.is_internet
+            data_list.append(is_internet)
+            is_divide = carrier_obj.is_divide
+            data_list.append(is_divide)
+
+
             attract_status = carrier_obj.attract_status
             data_list.append(attract_status)
+
             cooperation_model = carrier_obj.cooperation_model
             data_list.append(cooperation_model)
+
             rent_money = carrier_obj.rent_money
             data_list.append(rent_money)
+
             wuye_money = carrier_obj.wuye_money
             data_list.append(wuye_money)
+
             linkman = carrier_obj.linkman
             data_list.append(linkman)
+
             link_mobile = carrier_obj.link_mobile
             data_list.append(link_mobile)
-            attract_advantage = carrier_obj.attract_advantage
-            data_list.append(attract_advantage)
-            policy = carrier_obj.policy
-            data_list.append(policy)
+
             target_data_list.append(data_list)
 
         head_list = ''
         sheet = ''
         try:
             sheet_name_titles = {
-                "sheet1": ["楼宇名称", "所属县区", "楼宇类型(商铺/写字楼/其他)", "详细地址", "建成时间",
-                           "总占地面积（㎡）", "总建筑面积（㎡）", "闲置面积（㎡）", "总层数",
-                           "车位（个）", "电梯（部）", "拟招引业态", "合作模式(出租/出售/转让)",
-                           "租金范围（元/平米/天）", "物业费（元/平米/月）", "联系人", "联系方式", "招商优势",
-                           "优惠政策"]}
+                "sheet1": ["楼宇名称", "所属县区", "所属开发区", "楼宇类型", "写字楼等级",
+                           "详细地址", "建成时间（年）", "总占地面积（㎡）", "总建筑面积（㎡）",
+                           "单层面积（㎡）", "闲置面积（㎡）", "总层数", "车位（个）",
+                           "电梯（部）", "是否已通水", "是否已通电", "是否已通暖", "是否已通燃气",
+                           "是否已通网络", "是否可以分割", "拟招引产业", "合作模式", "租金（元/平米/天）",
+                           "物业费（元/平米/月）", "联系人", "联系方式"]}
             excel = xlwt.Workbook(encoding='utf-8')
             # 写入表头
             for i in range(len(sheet_name_titles)):
@@ -782,7 +873,7 @@ def batch_export_build():
                 for j in range(cols):
                     sheet.write(i + 1, j, target_data_list[i][j])
             time_stamp = '{0:%Y%m%d%H%M%S}'.format(datetime.now())
-            file_name = "可利用楼宇情况统计表{}.xlsx".format(time_stamp)
+            file_name = "楼宇信息表{}.xlsx".format(time_stamp)
             excel.save(path + file_name)
 
             # 记录日志
@@ -834,26 +925,80 @@ def batch_export_land():
         for select_id in select_id_list:
             carrier_obj = CarrierLand.query.filter_by(id=select_id).first()
             data_list = []
-            carrier_name = carrier_obj.land_name
-            data_list.append(carrier_name)
+
+            land_name = carrier_obj.land_name
+            data_list.append(land_name)
+
             land_code = carrier_obj.land_code
             data_list.append(land_code)
+
             district_name = carrier_obj.district_name
             data_list.append(district_name)
+
+            development_area = carrier_obj.development_area
+            data_list.append(development_area)
+
+            detail_address = carrier_obj.detail_address
+            data_list.append(detail_address)
+
+            land_use = carrier_obj.land_use
+            data_list.append(land_use)
+
             land_nature = carrier_obj.land_nature
             data_list.append(land_nature)
+
             total_area = carrier_obj.total_area
             data_list.append(total_area)
-            detail_address = carrier_obj.detail_address
-            data_list.append(detail_address)
+
+            surface_area = carrier_obj.surface_area
+            data_list.append(surface_area)
+
+            plot_ratio = carrier_obj.plot_ratio
+            data_list.append(plot_ratio)
+
+            greening_rate = carrier_obj.greening_rate
+            data_list.append(greening_rate)
+
+            density = carrier_obj.density
+            data_list.append(density)
+
+            height_permitted = carrier_obj.height_permitted
+            data_list.append(height_permitted)
+
+            transfer_year = carrier_obj.transfer_year
+            data_list.append(transfer_year)
+
+            develop_degree = carrier_obj.develop_degree
+            data_list.append(develop_degree)
+
+            investment_intensity = carrier_obj.investment_intensity
+            data_list.append(investment_intensity)
+
+            output_intensity = carrier_obj.output_intensity
+            data_list.append(output_intensity)
+
+            tax = carrier_obj.tax
+            data_list.append(tax)
+
+            linkman = carrier_obj.linkman
+            data_list.append(linkman)
+
+            telephone = carrier_obj.telephone
+            data_list.append(telephone)
+
+            other_requirements = carrier_obj.other_requirements
+            data_list.append(other_requirements)
+
             target_data_list.append(data_list)
         head_list = ''
         sheet = ''
         try:
             sheet_name_titles = {
-                "sheet1": ["土地名称", "土地编码", "所属县区",
-                           "用地性质(农业用地/工业用地/商业用地/建设用地/旅游用地/居民用地)",
-                           "总用地面积（公顷）", "详细地址"]}
+                "sheet1": ["土地名称", "土地编码", "所属区县", "所属开发区", "土地位置",
+                           "用地四至", "用地性质", "用地面积（净用地面积）",
+                           "地上控制建面（㎡）", "容积率", "绿化率", "建筑密度", "限高（㎡）",
+                           "出让年限", "用地开发程度", "投资强度（万元/亩）",
+                           "产出强度（万元/亩）", "地均税收（万元/亩）", "联系人", "联系方式", "其他要求"]}
             excel = xlwt.Workbook(encoding='utf-8')
             # 写入表头
             for i in range(len(sheet_name_titles)):
@@ -871,7 +1016,7 @@ def batch_export_land():
                 for j in range(cols):
                     sheet.write(i + 1, j, target_data_list[i][j])
             time_stamp = '{0:%Y%m%d%H%M%S}'.format(datetime.now())
-            file_name = "可利用土地情况统计表{}.xlsx".format(time_stamp)
+            file_name = "土地信息表{}.xlsx".format(time_stamp)
             excel.save(path + file_name)
 
             # 记录日志
@@ -926,70 +1071,103 @@ def batch_export_factory():
 
             # 提取数据，写入xslx表格
             data_list = []
-            carrier_name = carrier_obj.factory_name
-            data_list.append(carrier_name)
+
+            factory_name = carrier_obj.factory_name
+            data_list.append(factory_name)
+
             district_name = carrier_obj.district_name
             data_list.append(district_name)
+
+            development_area = carrier_obj.development_area
+            data_list.append(development_area)
+
+            build_type = carrier_obj.build_type
+            data_list.append(build_type)
+
             is_standard = carrier_obj.is_standard
             data_list.append(is_standard)
+
             detail_address = carrier_obj.detail_address
             data_list.append(detail_address)
+
             construction_time = carrier_obj.construction_time
             data_list.append(construction_time)
+
             cover_land_area = carrier_obj.cover_land_area
             data_list.append(cover_land_area)
+
             factory_area = carrier_obj.factory_area
             data_list.append(factory_area)
+
             empty_area = carrier_obj.empty_area
             data_list.append(empty_area)
+
             layer_num = carrier_obj.layer_num
             data_list.append(layer_num)
+
             factory_structure = carrier_obj.factory_structure
             data_list.append(factory_structure)
+
             width = carrier_obj.width
             data_list.append(width)
+
             high = carrier_obj.high
             data_list.append(high)
+
             bearing = carrier_obj.bearing
             data_list.append(bearing)
+
             is_water = carrier_obj.is_water
             data_list.append(is_water)
+
             is_electric = carrier_obj.is_electric
             data_list.append(is_electric)
+
             is_warm = carrier_obj.is_warm
             data_list.append(is_warm)
 
             is_gas = carrier_obj.is_gas
             data_list.append(is_gas)
+
             is_network = carrier_obj.is_network
             data_list.append(is_network)
+
+            is_car = carrier_obj.is_car
+            data_list.append(is_car)
+
             lift_num = carrier_obj.lift_num
             data_list.append(lift_num)
+
             attract_status = carrier_obj.attract_status
             data_list.append(attract_status)
+
+            settled_enterprise = carrier_obj.settled_enterprise
+            data_list.append(settled_enterprise)
+
             cooperation_model = carrier_obj.cooperation_model
             data_list.append(cooperation_model)
+
             rent_money = carrier_obj.rent_money
             data_list.append(rent_money)
+
             linkman = carrier_obj.linkman
             data_list.append(linkman)
+
             link_mobile = carrier_obj.link_mobile
             data_list.append(link_mobile)
-            attract_advantage = carrier_obj.attract_advantage
-            data_list.append(attract_advantage)
-            policy = carrier_obj.policy
-            data_list.append(policy)
+
             target_data_list.append(data_list)
         head_list = ''
         sheet = ''
         try:
             sheet_name_titles = {
-                "sheet1": ["厂房名称", "所属县区", "是否标准化厂房(是/否)", "详细地址", "建成时间",
-                           "总占地面积（㎡）", "总建筑面积（㎡）", "闲置面积（㎡）", "总层数", "建筑结构",
-                           "跨度（m）", "层高（m）", "承重（500kg/㎡）", "是否已通水(是/否)",
-                           "是否已通电(是/否)", "是否已通暖(是/否)", "是否已通燃气(是/否)",
-                           "是否已通网络(是/否)", "电梯/部", "拟招引业态", "合作模式(出租/出售/转让)",
-                           "租金范围（元/平米/天）", "联系人", "联系方式", "招商优势", "优惠政策"]}
+                "sheet1": ["厂房名称", "所属县区", "所属开发区", "厂房类型（单层/多层/混合层）", "是否标准化厂房(是/否)",
+                           "详细地址", "建成时间（年）", "总占地面积（㎡）", "总建筑面积（㎡）", "闲置面积（㎡）",
+                           "总层数", "建筑结构", "跨度（m）", "层高（m）",
+                           "承重（kg/㎡）", "是否已通水(是/否)", "是否已通电(是/否)",
+                           "是否已通暖(是/否)", "是否已通燃气(是/否)", "是否已通网络(是/否)", "是否可安装天车",
+                           "电梯(部)", "拟招引产业", "已入驻企业", "合作模式(出租/出售/转让)", "租金（元/平米/天）",
+                           "联系人", "联系方式"]}
             excel = xlwt.Workbook(encoding='utf-8')
             # 写入表头
             for i in range(len(sheet_name_titles)):
@@ -1007,7 +1185,7 @@ def batch_export_factory():
                 for j in range(cols):
                     sheet.write(i + 1, j, target_data_list[i][j])
             time_stamp = '{0:%Y%m%d%H%M%S}'.format(datetime.now())
-            file_name = "可利用厂房情况统计表{}.xlsx".format(time_stamp)
+            file_name = "厂房信息表{}.xlsx".format(time_stamp)
             excel.save(path + file_name)
 
             # 记录日志
@@ -1075,17 +1253,6 @@ def batch_delete():
             db.session.delete(carrier_obj)
             db.session.commit()
             delete_num += 1
-        # 更新es
-        # result = ''
-        # if carrier_type == 1:
-        #     result = delete_build_data(delete_id_list)
-        # if carrier_type == 2:
-        #     result = delete_land_data(delete_id_list)
-        # if carrier_type == 3:
-        #     result = delete_factory_data(delete_id_list)
-        # if not result['_shards']['successful'] and int(result['_shards']['successful']) <= 0:
-        #     db.session.rollback()
-        #     return jsonify(code=RET.THIRDERR, msg="批量删除操作后es更新错误，请核实！")
 
         # 记录日志
         operation_message = "删除了 {} 条 {} 数据".format(delete_num, name)
@@ -1153,27 +1320,6 @@ def batch_audit():
             carrier_obj.audit_message = audit_message
             db.session.commit()
 
-        # 更新es
-        # result = ''
-        # if carrier_type == 1:
-        #     result = fix_build_data(audit_id_list, '', '', '', '', '', '',
-        #                             '', '', '', '', '', '', '', '',
-        #                             '', '', '', '', '', '', '', '',
-        #                             '', '', audit_message, audit_flag)
-        # if carrier_type == 2:
-        #     result = fix_land_data(audit_id_list, '', '', '', '', '', '',
-        #                            '', '', '', '', '',
-        #                            '', '', '', '', audit_message, audit_flag)
-        # if carrier_type == 3:
-        #     result = fix_factory_data(audit_id_list, '', '', '', '', '',
-        #                               '', '', '', '',
-        #                               '', '', '', '', '', '',
-        #                               '', '', '', '', '', '', '', '',
-        #                               '', '', '', '', audit_message, audit_flag)
-        # if result['_shards']['successful'] and int(result['_shards']['successful']) <= 0:
-        #     db.session.rollback()
-        #     return jsonify(code=RET.THIRDERR, msg="批量审核后es更新失败，请核实！")
-
         # 记录日志
         if audit_flag == 1:
             audit_name = '通过'
@@ -1878,8 +2024,8 @@ def search_carrier_build():
                 "build_area": build_obj.build_area,
                 "empty_area": build_obj.empty_area,
                 "build_type": build_obj.build_type,
-                "build_structure": build_obj.build_structure,
-                "owner": build_obj.owner,
+                # "build_structure": build_obj.build_structure,
+                # "owner": build_obj.owner,
                 "linkman": build_obj.linkman,
                 "link_mobile": build_obj.link_mobile,
                 "attract_status": build_obj.attract_status,  # 拟招引状态
@@ -1887,8 +2033,8 @@ def search_carrier_build():
                 "cooperation_model": build_obj.cooperation_model,  # 合作模式
                 "audit_message": build_obj.audit_message,  # 审核信息
                 "wuye_money": build_obj.wuye_money,
-                "attract_advantage": build_obj.attract_advantage,
-                "policy": build_obj.policy,
+                # "attract_advantage": build_obj.attract_advantage,
+                # "policy": build_obj.policy,
                 "audit": build_obj.audit_status} for build_obj in build_obj_list]
             return jsonify(code=RET.OK, data={"data": data, "size": carrier_size, "msg": "数据获取成功！"})
         else:
@@ -2075,12 +2221,12 @@ def search_carrier_land():
                 "detail_address": land_obj.detail_address,
                 "audit_status": land_obj.audit_status,
                 "audit_message": land_obj.audit_message,  # 审核信息
-                "land_status": land_obj.land_status,
+                # "land_status": land_obj.land_status,
                 "land_code": land_obj.land_code,
                 "land_nature": land_obj.land_nature,
                 "total_area": land_obj.total_area,
                 "transfer_year": land_obj.transfer_year,
-                "industry_type": land_obj.industry_type
+                # "industry_type": land_obj.industry_type
             } for land_obj in land_obj_list]
             return jsonify(code=RET.OK, data={"data": data, "size": carrier_size, "msg": "数据获取成功！"})
         else:
@@ -2316,8 +2462,8 @@ def search_carrier_factory():
                 "layer_num": factory_obj.layer_num,
                 "attract_status": factory_obj.attract_status,
                 "cooperation_model": factory_obj.cooperation_model,
-                "attract_advantage": factory_obj.attract_advantage,
-                "policy": factory_obj.policy,
+                # "attract_advantage": factory_obj.attract_advantage,
+                # "policy": factory_obj.policy,
             } for factory_obj in factory_obj_list]
             return jsonify(code=RET.OK, data={"data": data, "size": carrier_size, "msg": "数据获取成功！"})
         else: