Commit 23fd0b8b by dong

fix20230109

parent e8264d65
...@@ -113,6 +113,84 @@ def get_count(chain_name): ...@@ -113,6 +113,84 @@ def get_count(chain_name):
return company_count return company_count
# def find_up_thr1(industry_type, industry_id):
# # relation 1为上游,2为中游,3为下游
# relation = ''
# if industry_type == 1:
# relation = '上游'
# if industry_type == 2:
# relation = '中游'
# if industry_type == 3:
# relation = '下游'
#
# # 零级,上中下三游
# data = {
# "node": "{}".format(relation),
# "level": 1,
# "subNodeList": [],
# }
#
# # 获取一级节点
# chain_one_obj_list = IndustryChain.query.filter_by(industry_type=industry_type,
# relate_id=industry_id).all()
# res_one = [{"chain_name": chain_one_obj.industry_name,
# "chain_name_id": chain_one_obj.id
# } for chain_one_obj in chain_one_obj_list]
# for pname_one in res_one: # 一级节点
# chain_name = pname_one["chain_name"]
# total_count = 0
#
# # 一级的企业数量
# company_count = get_count(chain_name)
# total_count += company_count
# # 一级
# node_one = {
# "node": "{}".format(chain_name),
# "level": 2,
# "company_count": total_count,
# "subNodeList": []
# }
# # 获取二级节点
# chain_two_obj_list = IndustryChain.query.filter_by(relate_id=pname_one["chain_name_id"]).all()
# res_two = [{"chain_name": chain_two_obj.industry_name,
# "chain_name_id": chain_two_obj.id
# } for chain_two_obj in chain_two_obj_list]
#
# for item in res_two:
# pname_two = item
# chain_name = pname_two["chain_name"]
# company_count = get_count(chain_name)
# total_count += company_count
#
# # 二级
# node_two = {
# "node": "{}".format(chain_name),
# "level": 3,
# "company_count": company_count,
# "subNodeList": []
# }
# # 获取第三级节点
# chain_three_obj_list = IndustryChain.query.filter_by(relate_id=pname_two["chain_name_id"]).all()
# res_three = [{"chain_name": chain_three_obj.industry_name,
# "chain_name_id": chain_three_obj.id
# } for chain_three_obj in chain_three_obj_list]
# for itm in res_three:
# pname_thr = itm
# chain_name = pname_thr["chain_name"]
# company_count = get_count(chain_name)
# total_count += company_count
#
# # 三级
# node_thr = {
# "node": "{}".format(chain_name),
# "level": 4,
# "company_count": company_count,
# "subNodeList": []
# }
# node_two["subNodeList"].append(node_thr)
# node_one["subNodeList"].append(node_two)
# data["subNodeList"].append(node_one)
# return data
def find_up_thr1(industry_type, industry_id): def find_up_thr1(industry_type, industry_id):
# relation 1为上游,2为中游,3为下游 # relation 1为上游,2为中游,3为下游
relation = '' relation = ''
...@@ -137,15 +215,15 @@ def find_up_thr1(industry_type, industry_id): ...@@ -137,15 +215,15 @@ def find_up_thr1(industry_type, industry_id):
"chain_name_id": chain_one_obj.id "chain_name_id": chain_one_obj.id
} for chain_one_obj in chain_one_obj_list] } for chain_one_obj in chain_one_obj_list]
for pname_one in res_one: # 一级节点 for pname_one in res_one: # 一级节点
chain_name = pname_one["chain_name"] chain_name1 = pname_one["chain_name"]
total_count = 0 total_count = 0
node_one = ''
# 一级的企业数量 # 一级的企业数量
company_count = get_count(chain_name) company_count = get_count(chain_name1)
total_count += company_count total_count += company_count
# 一级 # 一级
node_one = { node_one = {
"node": "{}".format(chain_name), "node": "{}".format(chain_name1),
"level": 2, "level": 2,
"company_count": total_count, "company_count": total_count,
"subNodeList": [] "subNodeList": []
...@@ -158,13 +236,13 @@ def find_up_thr1(industry_type, industry_id): ...@@ -158,13 +236,13 @@ def find_up_thr1(industry_type, industry_id):
for item in res_two: for item in res_two:
pname_two = item pname_two = item
chain_name = pname_two["chain_name"] chain_name2 = pname_two["chain_name"]
company_count = get_count(chain_name) company_count = get_count(chain_name2)
total_count += company_count total_count += company_count
# 二级 # 二级
node_two = { node_two = {
"node": "{}".format(chain_name), "node": "{}".format(chain_name2),
"level": 3, "level": 3,
"company_count": company_count, "company_count": company_count,
"subNodeList": [] "subNodeList": []
...@@ -176,18 +254,25 @@ def find_up_thr1(industry_type, industry_id): ...@@ -176,18 +254,25 @@ def find_up_thr1(industry_type, industry_id):
} for chain_three_obj in chain_three_obj_list] } for chain_three_obj in chain_three_obj_list]
for itm in res_three: for itm in res_three:
pname_thr = itm pname_thr = itm
chain_name = pname_thr["chain_name"] chain_name3 = pname_thr["chain_name"]
company_count = get_count(chain_name) company_count = get_count(chain_name3)
total_count += company_count total_count += company_count
# 三级 # 三级
node_thr = { node_thr = {
"node": "{}".format(chain_name), "node": "{}".format(chain_name3),
"level": 4, "level": 4,
"company_count": company_count, "company_count": company_count,
"subNodeList": [] "subNodeList": []
} }
node_two["subNodeList"].append(node_thr) node_two["subNodeList"].append(node_thr)
# 一级
node_one = {
"node": "{}".format(chain_name1),
"level": 2,
"company_count": total_count,
"subNodeList": []
}
node_one["subNodeList"].append(node_two) node_one["subNodeList"].append(node_two)
data["subNodeList"].append(node_one) data["subNodeList"].append(node_one)
return data return data
......
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