fix

bb4eda25 · 赵宇 · cf78e5c0 · bb4eda25 · bb4eda25 · bb4eda25
Commit bb4eda25 authored Dec 30, 2021 by 赵宇
Expand all Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 102 deletions

apps/atlas/view.py
+0 -92

apps/atlas/view_graph.py
+0 -0

apps/models.py
+12 -10

apps/view_attract/view.py
+0 -0

No files found.
--- a/apps/atlas/view.py
+++ b/apps/atlas/view.py
@@ -133,98 +133,6 @@
 #     return jsonify(code=RET.OK, msg="获取成功", options=data)
 #
 #
-# # 太原市企业列表
-# @api_atlas.route('/industry/enterprise', methods=['POST'])
-# # @login_required
-# def enterprise():
-#     '''太原市企业列表'''
-#     req_dict = request.get_json()
-#     inid = req_dict.get("inid")  # 行业id
-#     cate = req_dict.get("cate")  # 行业等级,（高端设备等五个为"1",子行业为"2"）
-#     page = req_dict.get("page")  # 分页页码
-#     perpage = req_dict.get("perpage")  # 分页大小
-#
-#     entype = req_dict.get("entype")  # 企业类型id
-#     qualificat = req_dict.get("qualificat")  # 企业资质id
-#     capital = req_dict.get("capital")  # 注册资本id
-#     quoted = req_dict.get("quoted")  # 上市板块
-#     district = req_dict.get("district")  # 太原市下区县
-#     yearid = req_dict.get("yearid")  # 成立时间年限id
-#     roundid = req_dict.get("roundid")  # 融资轮次id(天使/种子，1)（PreA/A+,2）（PreB/B+,3）(C轮以上，4)（收并购，5）（战略投资，6）（其他，7）
-#     product = req_dict.get("product")  # 产业产品选择
-#     company_name = req_dict.get("company_name")  # 产业产品名称筛选
-#     sorts = req_dict.get("sorts")  # 排序 sorts "1"按时间降序 ，“2”按热度降序
-#
-#     # 校验参数完整性
-#     if not all([inid, cate, page, perpage]):
-#         return jsonify(code=RET.PARAMERR, msg="参数不完整")
-#
-#     try:
-#         if cate == "1":
-#             company = Company.query.filter_by(f_type=inid, city="太原市")
-#         else:
-#             company = Company.query.filter_by(c_type=inid, city="太原市")
-#         # 企业类型
-#         if entype:
-#             company = company.filter_by(entypeid=entype)
-#         # 企业资质
-#         if qualificat:
-#             if qualificat == 1:
-#                 company = company.filter_by(high_new=1)
-#             if qualificat == 2:
-#                 company = company.filter_by(tbe=1)
-#             if qualificat == 3:
-#                 company = company.filter_by(quoted_company=1)
-#             if qualificat == 4:
-#                 company = company.filter_by(sxonhun=1)
-#             if qualificat == 5:
-#                 company = company.filter_by(isfive=1)
-#             if qualificat == 6:
-#                 company = company.filter_by(unicorn=1)
-#             if qualificat == 7:
-#                 company = company.filter_by(dengl=1)
-#             if qualificat == 8:
-#                 company = company.filter_by(zjtg=1)
-#             if qualificat == 9:
-#                 company = company.filter_by(scale=1)
-#             if qualificat == 10:
-#                 company = company.filter_by(serve=1)
-#         # 注册资本
-#         if capital:
-#             company = company.filter_by(capital_id=capital)
-#         # 上市板块
-#         if quoted:
-#             company = company.filter_by(public_id=quoted)
-#         # 区域选择
-#         if district:
-#             company = company.filter_by(district=district)
-#         # 成立时间id
-#         if yearid:
-#             company = company.filter_by(yearid=yearid)
-#         # 融资轮次
-#         if roundid:
-#             company = company.filter_by(roundid=roundid)
-#         if company_name:
-#             company = company.filter(Company.company_name.like("%{}%".format(company_name)))
-#         if product:
-#             company = Company.query.filter(Company.product_all.like("%{}%".format(product)))
-#         size = company.count()
-#         if sorts == "1":
-#             companys = company.order_by(Company.build_date.desc()).paginate(page, perpage).items  # 企业热度倒序
-#         else:
-#             companys = company.order_by(Company.hots.desc()).paginate(page, perpage).items  # 企业热度倒序
-#
-#         df = [{"id": i.id,
-#                "company_name": i.company_name,
-#                "hots": i.hots} for i in companys]
-#         data = {"size": size, "df": df}
-#     except Exception as e:
-#         current_app.logger.error(e)
-#         return jsonify(code=RET.DBERR, msg="数据库查询错误")
-#
-#     return jsonify(code=RET.OK, msg="获取成功", data=data)
-#
-#
 # # 行业信息总览
 # @api_atlas.route('/industry/overview', methods=['POST'])
 # # @login_required

--- a/apps/atlas/view_graph.py
+++ b/apps/atlas/view_graph.py
--- a/apps/models.py
+++ b/apps/models.py
@@ -188,8 +188,8 @@ class CompanyAdminPermission(db.Model):
    company_id = db.Column(db.Integer, doc='晋城企业id', comment='晋城企业id')
    number = db.Column(db.String(32), doc='晋城企业行政许可编号', comment='晋城企业行政许可编号')
    name = db.Column(db.String(32), doc='晋城企业行政许可证名称', comment='晋城企业行政许可证名称')
-    time = db.Column(db.String(32), doc='许可证名称', comment='许可证名称')
+    time = db.Column(db.DateTime, doc='有效期自', comment='有效期自')
-    effective_data = db.Column(db.String(32), doc='有效日期', comment='有效日期')
+    effective_data = db.Column(db.DateTime, doc='有效期至', comment='有效期至')
    Licensing_authority = db.Column(db.String(32), doc='许可机关', comment='许可机关')
    content = db.Column(db.String(32), doc='许可内容', comment='许可内容')
    source = db.Column(db.String(32), doc='来源', comment='来源')
@@ -215,7 +215,7 @@ class CompanyImportExport(db.Model):
    company_id = db.Column(db.Integer, doc='晋城企业id', comment='晋城企业id')
    register_customs = db.Column(db.String(32), doc='注册海关', comment='注册海关')
    business_category = db.Column(db.String(32), doc='经营类别', comment='经营类别')
-    register_date = db.Column(db.String(32), doc='注册日期', comment='注册日期')
+    register_date = db.Column(db.DateTime, doc='注册日期', comment='注册日期')
 # 晋城企业供应商
@@ -227,9 +227,11 @@ class CompanySupplier(db.Model):
    supplier_name = db.Column(db.String(32), doc='客户名字', comment='客户名字')
    buy_rate = db.Column(db.String(32), doc='采购占比', comment='采购占比')
    buy_money = db.Column(db.String(32), doc='采购金额', comment='采购金额')
-    open_time = db.Column(db.String(32), doc='公开时间', comment='公开时间')
+    open_time = db.Column(db.DateTime, doc='公开时间', comment='公开时间')
    data_source = db.Column(db.String(32), doc='数据来源', comment='数据来源')
    relation = db.Column(db.String(32), doc='关联关系', comment='关联关系')
+    lng = db.Column(db.String(100), doc='经度', comment='经度')  # 经度
+    lat = db.Column(db.String(100), doc='纬度', comment='纬度')  # 纬度
 # 晋城企业客户
@@ -241,7 +243,7 @@ class CompanyCustomer(db.Model):
    customer_name = db.Column(db.String(32), doc='客户', comment='客户')
    sales_rate = db.Column(db.String(32), doc='销售占比', comment='销售占比')
    sales_money = db.Column(db.String(32), doc='销售金额', comment='销售金额')
-    open_time = db.Column(db.String(32), doc='公开时间', comment='公开时间')
+    open_time = db.Column(db.DateTime, comment='公开时间')
    data_source = db.Column(db.String(32), doc='数据来源', comment='数据来源')
    relation = db.Column(db.String(32), doc='关联关系', comment='关联关系')
@@ -258,7 +260,7 @@ class CompanyStock(db.Model):
    from_company = db.Column(db.String(25), doc='出质股权的企业', comment='出质股权的企业')
    pledgee = db.Column(db.String(10), doc='质权人', comment='质权人')
    amount = db.Column(db.Float, doc='出质股权数额（万元）', comment='出质股权数额（万元）')
-    datatime = db.Column(db.String(20), doc='登记日期', comment='登记日期')
+    datatime = db.Column(db.DateTime, doc='登记日期', comment='登记日期')
    status = db.Column(db.String(10), doc='状态', comment='状态')
@@ -275,7 +277,7 @@ class CompanyPledge(db.Model):
    number = db.Column(db.Float, doc='质押股份总额（股）', comment='质押股份总额（股）')
    amount = db.Column(db.Float, doc='质押股份市值（元）', comment='质押股份市值（元）')
    status = db.Column(db.String(10), doc='状态', comment='状态')
-    datatime = db.Column(db.String(20), doc='公告日期', comment='公告日期')
+    datatime = db.Column(db.DateTime, doc='公告日期', comment='公告日期')
 # 晋城企业详情担保信息
@@ -289,7 +291,7 @@ class CompanyDanbao(db.Model):
    person2 = db.Column(db.String(10), doc='担保方', comment='担保方')
    method = db.Column(db.String(10), doc='方式', comment='方式')
    amount = db.Column(db.Float, doc='担保金额（万元）', comment='担保金额（万元）')
-    datatime = db.Column(db.String(20), doc='公告日期', comment='公告日期')
+    datatime = db.Column(db.DateTime, doc='公告日期', comment='公告日期')
 # 晋城企业详情专利信息
@@ -303,9 +305,9 @@ class CompanyPatent(db.Model):
    type = db.Column(db.String(20), doc='类型', comment='类型')
    status = db.Column(db.String(20), doc='法律状态', comment='法律状态')
    num = db.Column(db.String(50), doc='申请号', comment='申请号')
-    day = db.Column(db.String(20), doc='申请日', comment='申请日')
+    day = db.Column(db.DateTime, doc='申请日', comment='申请日')
    open_num = db.Column(db.String(20), doc='公开号', comment='公开号')
-    datatime = db.Column(db.String(20), doc='公开日期', comment='公开日期')
+    datatime = db.Column(db.DateTime, doc='公开日期', comment='公开日期')
    person = db.Column(db.String(20), doc='发明人', comment='发明人')

--- a/apps/view_attract/view.py
+++ b/apps/view_attract/view.py