Skip to content

M
mancheng
Commit 79ab31be by dong
Options

fix20220519

parent 4a2432f4
Showing with 61 additions and 55 deletions
apps/inves_manage/view.py
......@@ -1993,10 +1993,10 @@ def stage_in_list():
while start_time < date_end and start_time < time_now:
month = int((start_time.tm_mon - 0.5) // 3)
time_key = str(start_time.tm_year) + "-" + lis_qua[month] + "-" + str(start_time.tm_mon)
end_time = time.strftime('%Y-%m-%d %H:%M:%S', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S") - relativedelta(months=-1)
end_time = time.strftime('%Y-%m-%d', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d") - relativedelta(months=-1)
end_time = str(end_time)
end_time = time.strptime(end_time, '%Y-%m-%d %H:%M:%S')
end_time = time.strptime(end_time, '%Y-%m-%d')
item_time = item.filter(Item.store >= start_time, Item.store < end_time)
evolve_data = [j, str(start_time.tm_year), lis_qua[month], str(start_time.tm_mon)]
......@@ -2107,10 +2107,10 @@ def stage_in_down():
j = 1
while start_time < date_end and start_time < time_now:
month = int((start_time.tm_mon - 0.5) // 3)
end_time = time.strftime('%Y-%m-%d %H:%M:%S', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S") - relativedelta(months=-1)
end_time = time.strftime('%Y-%m-%d', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d") - relativedelta(months=-1)
end_time = str(end_time)
end_time = time.strptime(end_time, '%Y-%m-%d %H:%M:%S')
end_time = time.strptime(end_time, '%Y-%m-%d')
item_time = item.filter(Item.store >= start_time, Item.store < end_time)
evolve = []
evolve_data = [j, str(start_time.tm_year), lis_qua[month], str(start_time.tm_mon)]
......@@ -2147,10 +2147,10 @@ def stage_in_down():
j = 1
while start_time < date_end and start_time < time_now:
month = int((start_time.tm_mon - 0.5) // 3)
end_time = time.strftime('%Y-%m-%d %H:%M:%S', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S") - relativedelta(months=-1)
end_time = time.strftime('%Y-%m-%d', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d") - relativedelta(months=-1)
end_time = str(end_time)
end_time = time.strptime(end_time, '%Y-%m-%d %H:%M:%S')
end_time = time.strptime(end_time, '%Y-%m-%d')
item_time = item.filter(Item.store >= start_time, Item.store < end_time)
user_data = [j, str(start_time.tm_year), lis_qua[month], str(start_time.tm_mon)]
......@@ -2179,10 +2179,10 @@ def stage_in_down():
j = 1
while start_time < date_end and start_time < time_now:
month = int((start_time.tm_mon - 0.5) // 3)
end_time = time.strftime('%Y-%m-%d %H:%M:%S', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S") - relativedelta(months=-1)
end_time = time.strftime('%Y-%m-%d', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d") - relativedelta(months=-1)
end_time = str(end_time)
end_time = time.strptime(end_time, '%Y-%m-%d %H:%M:%S')
end_time = time.strptime(end_time, '%Y-%m-%d')
item_time = item.filter(Item.store >= start_time, Item.store < end_time)
industry_data = [j, str(start_time.tm_year), lis_qua[month], str(start_time.tm_mon)]
......@@ -2400,10 +2400,10 @@ def stageoutlist():
while start_time < date_end and start_time < time_now:
month = int((start_time.tm_mon - 0.5) // 3)
time_key = str(start_time.tm_year) + "-" + lis_qua[month] + "-" + str(start_time.tm_mon)
end_time = time.strftime('%Y-%m-%d %H:%M:%S', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S") - relativedelta(months=-1)
end_time = time.strftime('%Y-%m-%d', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d") - relativedelta(months=-1)
end_time = str(end_time)
end_time = time.strptime(end_time, '%Y-%m-%d %H:%M:%S')
end_time = time.strptime(end_time, '%Y-%m-%d')
item_time = item.filter(Item.store >= start_time, Item.store < end_time)
evolve_data = [j, str(start_time.tm_year), lis_qua[month], str(start_time.tm_mon)]
......@@ -2515,10 +2515,10 @@ def stage_out_down():
j = 1
while start_time < date_end and start_time < time_now:
month = int((start_time.tm_mon - 0.5) // 3)
end_time = time.strftime('%Y-%m-%d %H:%M:%S', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S") - relativedelta(months=-1)
end_time = time.strftime('%Y-%m-%d', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d") - relativedelta(months=-1)
end_time = str(end_time)
end_time = time.strptime(end_time, '%Y-%m-%d %H:%M:%S')
end_time = time.strptime(end_time, '%Y-%m-%d')
item_time = item.filter(Item.store >= start_time, Item.store < end_time)
evolve = []
evolve_data = [j, str(start_time.tm_year), lis_qua[month], str(start_time.tm_mon)]
......@@ -2544,10 +2544,10 @@ def stage_out_down():
j = 1
while start_time < date_end and start_time < time_now:
month = int((start_time.tm_mon - 0.5) // 3)
end_time = time.strftime('%Y-%m-%d %H:%M:%S', start_time)
end_time = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S") - relativedelta(months=-1)
end_time = time.strftime('%Y-%m-%d', start_time)
end_time = datetime.strptime(end_time, "%Y-%m-%d") - relativedelta(months=-1)
end_time = str(end_time)
end_time = time.strptime(end_time, '%Y-%m-%d %H:%M:%S')
end_time = time.strptime(end_time, '%Y-%m-%d')
item_time = item.filter(Item.store >= start_time, Item.store < end_time)
user_data = [j, str(start_time.tm_year), lis_qua[month], str(start_time.tm_mon)]
......@@ -2578,10 +2578,10 @@ def stage_out_down():
j = 1
while start_time < date_end and start_time < time_now:
month = int((start_time.tm_mon - 0.5) // 3)
end_time = time.strftime('%Y-%m-%d %H:%M:%S', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d %H:%M:%S") - relativedelta(months=-1)
end_time = time.strftime('%Y-%m-%d', start_time) # - relativedelta(months= +1)
end_time = datetime.strptime(end_time, "%Y-%m-%d") - relativedelta(months=-1)
end_time = str(end_time)
end_time = time.strptime(end_time, '%Y-%m-%d %H:%M:%S')
end_time = time.strptime(end_time, '%Y-%m-%d')
item_time = item.filter(Item.store >= start_time, Item.store < end_time)
industry_data = [j, str(start_time.tm_year), lis_qua[month], str(start_time.tm_mon)]
......
apps/view_360company/view.py
......@@ -35,7 +35,7 @@ def get_all_enterprise():
data = {"data": [{"id": enterprise.id,
"company": enterprise.company_name, # 企业名
"area": enterprise.city + enterprise.district,
"createtime": (enterprise.build_date).strftime("%Y-%m-%d %H:%M:%S") if enterprise.build_date else '',
"createtime": (enterprise.build_date).strftime("%Y-%m-%d") if enterprise.build_date else '',
"legal": enterprise.legal,
......
apps/view_atlas/view.py
......@@ -164,7 +164,7 @@ def industry_enterprise():
df = [{"id": i.id,
"company_name": i.company_name,
"district": i.district,
"build_date": (i.build_date).strftime("%Y-%m-%d %H:%M:%S"),
"build_date": (i.build_date).strftime("%Y-%m-%d") if i.build_date else '',
"legal": i.legal,
"capital_nums": i.capital_nums,
"entype": i.entype,
......@@ -173,12 +173,15 @@ def industry_enterprise():
"high_new": '高新技术企业' if i.high_new == '1' else '',
"tbe": '科技型中小企业' if i.tbe == '1' else '',
"quoted_company": '上市企业' if i.quoted_company == '1' else '',
"zjtg": '精专特新企业' if i.zjtg == '1' else '',
"zjtg": '专精特新企业' if i.zjtg == '1' else '',
"unicorn": '独角兽企业' if i.unicorn == '1' else '',
"dengl": '瞪羚企业' if i.dengl == '1' else '',
"isfive": '五百强企业' if i.isfive == '1' else '',
"scale": '规模以上企业' if i.scale == '1' else ''
"scale": '规模以上企业' if i.scale == '1' else '',
"hosts": '企业热度' if i.hosts else ''
} for i in companys]
df.sort(key=lambda s: s["hosts"], reverse=True)
data = {"size": size, "df": df}
return jsonify(code=RET.OK, msg="获取成功", data=data)
except Exception as e:
......
apps/view_index/view.py
......@@ -469,7 +469,8 @@ def showListb():
"name": i.company_name,
"industry": i.company_industry if i.company_industry else "",
"product": i.product if i.product else "",
"build_date": "",
# "build_date": "",
"build_date": (i.build_date).strftime("%Y-%m-%d"),
"capital": i.capital if i.capital else "",
"isfive": "中国500强企业" if i.isfive == "1" else "",
"quoted_company": "上市企业" if i.public_sector != "空" else "",
......@@ -584,8 +585,8 @@ def company_detail():
"label1_name": '行政许可',
"number": data.number,
"name": data.name,
"time": (data.time).strftime("%Y-%m-%d %H:%M:%S"),
"effective_data": (data.effective_data).strftime("%Y-%m-%d %H:%M:%S"),
"time": (data.time).strftime("%Y-%m-%d"),
"effective_data": (data.effective_data).strftime("%Y-%m-%d"),
"Licensing_authority": data.Licensing_authority,
"content": data.content,
"source": data.source} for data in data_info1 if data_info1],
......@@ -599,13 +600,13 @@ def company_detail():
"label3_name": '进出口信用',
"register_customs": data.register_customs,
"business_category": data.business_category,
"register_date": (data.register_date).strftime("%Y-%m-%d %H:%M:%S")} for data in data_info3 if data_info3],
"register_date": (data.register_date).strftime("%Y-%m-%d")} for data in data_info3 if data_info3],
"label4": [{
"label4_name": '供应商',
"supplier_name": data.supplier_name,
"buy_rate": data.buy_rate,
"buy_money": data.buy_money,
"open_time": (data.open_time).strftime("%Y-%m-%d %H:%M:%S"),
"open_time": (data.open_time).strftime("%Y-%m-%d"),
"data_source": data.data_source,
"relation": data.relation} for data in data_info4 if data_info4],
"label5": [{
......@@ -613,7 +614,7 @@ def company_detail():
"customer_name": data.customer_name,
"sales_rate": data.sales_rate,
"sales_money": data.sales_money,
"open_time": (data.open_time).strftime("%Y-%m-%d %H:%M:%S"),
"open_time": (data.open_time).strftime("%Y-%m-%d"),
"data_source": data.data_source,
"relation": data.relation} for data in data_info5 if data_info5]
},
......@@ -627,7 +628,7 @@ def company_detail():
"from_company": data.from_company,
"pledgee": data.pledgee,
"amount": data.amount,
"datatime": (data.datatime).strftime("%Y-%m-%d %H:%M:%S"),
"datatime": (data.datatime).strftime("%Y-%m-%d"),
"status": data.status
} for data in data_info6 if data_info6],
"label2": [{
......@@ -638,7 +639,7 @@ def company_detail():
"number": data.number,
"amount": data.amount,
"status": data.status,
"datatime": (data.datatime).strftime("%Y-%m-%d %H:%M:%S")
"datatime": (data.datatime).strftime("%Y-%m-%d")
} for data in data_info7 if data_info7],
"label3": [{
"label3_name": '担保信息',
......@@ -646,7 +647,7 @@ def company_detail():
"person2": data.person2,
"method": data.method,
"amount": data.amount,
"datatime": (data.datatime).strftime("%Y-%m-%d %H:%M:%S")
"datatime": (data.datatime).strftime("%Y-%m-%d")
} for data in data_info8 if data_info8]
},
# 知识产权数据封装
......@@ -658,9 +659,9 @@ def company_detail():
"type": data.type,
"status": data.status,
"num": data.num,
"day": (data.day).strftime("%Y-%m-%d %H:%M:%S"),
"day": (data.day).strftime("%Y-%m-%d"),
"open_num": data.open_num,
"datatime": (data.datatime).strftime("%Y-%m-%d %H:%M:%S"),
"datatime": (data.datatime).strftime("%Y-%m-%d"),
"person": data.person
} for data in data_info9 if data_info9]
},
......@@ -779,8 +780,8 @@ def enterprise_detail():
"label1_name": '行政许可',
"number": data.number,
"name": data.name,
"time": (data.time).strftime("%Y-%m-%d %H:%M:%S"),
"effective_data": (data.effective_data).strftime("%Y-%m-%d %H:%M:%S"),
"time": (data.time).strftime("%Y-%m-%d"),
"effective_data": (data.effective_data).strftime("%Y-%m-%d"),
"Licensing_authority": data.Licensing_authority,
"content": data.content,
"source": data.source} for data in data_info1 if data_info1],
......@@ -794,13 +795,13 @@ def enterprise_detail():
"label3_name": '进出口信用',
"register_customs": data.register_customs,
"business_category": data.business_category,
"register_date": (data.register_date).strftime("%Y-%m-%d %H:%M:%S")} for data in data_info3 if data_info3],
"register_date": (data.register_date).strftime("%Y-%m-%d")} for data in data_info3 if data_info3],
"label4": [{
"label4_name": '供应商',
"supplier_name": data.supplier_name,
"buy_rate": data.buy_rate,
"buy_money": data.buy_money,
"open_time": (data.open_time).strftime("%Y-%m-%d %H:%M:%S"),
"open_time": (data.open_time).strftime("%Y-%m-%d"),
"data_source": data.data_source,
"relation": data.relation} for data in data_info4 if data_info4],
"label5": [{
......@@ -808,7 +809,7 @@ def enterprise_detail():
"customer_name": data.customer_name,
"sales_rate": data.sales_rate,
"sales_money": data.sales_money,
"open_time": (data.open_time).strftime("%Y-%m-%d %H:%M:%S"),
"open_time": (data.open_time).strftime("%Y-%m-%d"),
"data_source": data.data_source,
"relation": data.relation} for data in data_info5 if data_info5]
},
......@@ -822,7 +823,7 @@ def enterprise_detail():
"from_company": data.from_company,
"pledgee": data.pledgee,
"amount": data.amount,
"datatime": (data.datatime).strftime("%Y-%m-%d %H:%M:%S"),
"datatime": (data.datatime).strftime("%Y-%m-%d"),
"status": data.status
} for data in data_info6 if data_info6],
"label2": [{
......@@ -833,7 +834,7 @@ def enterprise_detail():
"number": data.number,
"amount": data.amount,
"status": data.status,
"datatime": (data.datatime).strftime("%Y-%m-%d %H:%M:%S")
"datatime": (data.datatime).strftime("%Y-%m-%d")
} for data in data_info7 if data_info7],
"label3": [{
"label3_name": '担保信息',
......@@ -841,7 +842,7 @@ def enterprise_detail():
"person2": data.person2,
"method": data.method,
"amount": data.amount,
"datatime": (data.datatime).strftime("%Y-%m-%d %H:%M:%S")
"datatime": (data.datatime).strftime("%Y-%m-%d")
} for data in data_info8 if data_info8]
},
# 知识产权数据封装
......@@ -853,9 +854,9 @@ def enterprise_detail():
"type": data.type,
"status": data.status,
"num": data.num,
"day": (data.day).strftime("%Y-%m-%d %H:%M:%S"),
"day": (data.day).strftime("%Y-%m-%d"),
"open_num": data.open_num,
"datatime": (data.datatime).strftime("%Y-%m-%d %H:%M:%S"),
"datatime": (data.datatime).strftime("%Y-%m-%d"),
"person": data.person
} for data in data_info9 if data_info9]
},
......
apps/view_mobile/mobile_collect.py
......@@ -49,7 +49,7 @@ def mobile_collect_com():
company.append({
"id": i.id,
"company_name": i.company_name,
"create_time": create_time.create_time.strftime('%Y-%m-%d %H:%M:%S'),
"create_time": create_time.create_time.strftime('%Y-%m-%d'),
"build_date": i.build_date.strftime("%Y-%m-%d") if i.build_date else "-",
"legal":i.legal if i.legal else "-",
"money":"{}万元".format(i.capital_nums) if i.capital_nums else "-"
......@@ -72,7 +72,7 @@ def mobile_collect_com():
company.append({
"id": i.id,
"company_name": i.company_name,
"create_time": create_time.create_time.strftime('%Y-%m-%d %H:%M:%S'),
"create_time": create_time.create_time.strftime('%Y-%m-%d'),
"build_date": i.build_date.strftime("%Y-%m-%d") if i.build_date else "-",
"legal":i.legal if i.legal else "-",
"money":"{}万元".format(i.capital_nums) if i.capital_nums else "-"
......
apps/view_radar/view.py
......@@ -287,6 +287,8 @@ def prolink():
num = [math.ceil(i.score) if i.score else 0 for i in edata]
num.sort()
num = [i for i in num if i > 0]
if not num:
return jsonify(code=RET.NODATA, msg="该产业的产业评估三环节评分均为0")
cent = num[int(len(num) * 0.5)]
deletion = len([item for item in edata if item.score == 0]) # 缺失环节
......@@ -415,7 +417,7 @@ def recommond():
"capital_nums": com.capital_nums,
"entype": com.entype,
"high_new": "高新企业" if com.high_new == "1" else "",
"high_new": "高新技术企业" if com.high_new == "1" else "",
"tbe": "科技型中小企业" if com.tbe == "1" else "",
"fianacing": "融资企业" if com.fianacing == "1" else "",
"quoted_company": "上市企业" if com.quoted_company == "1" else "",
......@@ -536,7 +538,7 @@ def newList():
data_list = []
for i in enters:
zizhi_list = {
"high_new": "高新企业" if i.high_new == "1" else "",
"high_new": "高新技术企业" if i.high_new == "1" else "",
"tbe": "科技型中小企业" if i.tbe == "1" else "",
"fianacing": "融资企业" if i.fianacing == "1" else "",
"quoted_ipany": "上市企业" if i.quoted_company == "1" else "",
......
apps/view_user/view_other.py
......@@ -260,7 +260,7 @@ def collect_com():
company.append({
"id": i.id,
"company_name": i.company_name,
"create_time": create_time.create_time.strftime('%Y-%m-%d %H:%M:%S'),
"create_time": create_time.create_time.strftime('%Y-%m-%d'),
"build_date": i.build_date.strftime("%Y-%m-%d") if i.build_date else "-"
})
except Exception as e:
......@@ -281,7 +281,7 @@ def collect_com():
company.append({
"id": i.id,
"company_name": i.company_name,
"create_time": create_time.create_time.strftime('%Y-%m-%d %H:%M:%S'),
"create_time": create_time.create_time.strftime('%Y-%m-%d'),
"build_date": i.build_date.strftime("%Y-%m-%d") if i.build_date else "-"
})
except Exception as e:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment