Skip to content

M
mancheng
Commit 434128c2 by dong
Options

fix20230111

parent de810d92
Showing with 52 additions and 42 deletions
apps/inves_manage/project_manager.py
...@@ -289,6 +289,9 @@ def upload_project_data2(): ...@@ -289,6 +289,9 @@ def upload_project_data2():
investor_name = row_content[5] # 投资方名称 investor_name = row_content[5] # 投资方名称
country = row_content[6] # 投资方国别 country = row_content[6] # 投资方国别
provence = row_content[7] # 投资方省份 provence = row_content[7] # 投资方省份
if provence and not country:
return jsonify(code=RET.PARAMERR, msg="如选择了省份，请完善国别！")
city = row_content[8] # 投资方市 city = row_content[8] # 投资方市
industry1 = row_content[9] # 所属行业1 industry1 = row_content[9] # 所属行业1
industry2 = row_content[10] # 所属行业2 industry2 = row_content[10] # 所属行业2
...@@ -605,6 +608,9 @@ def project_edit(): ...@@ -605,6 +608,9 @@ def project_edit():
is_transf_project = request.form['is_transf_project'] is_transf_project = request.form['is_transf_project']
country = request.form['country'] country = request.form['country']
provence = request.form['provence'] provence = request.form['provence']
if provence and not country:
return jsonify(code=RET.PARAMERR, msg="如选择了省份，请完善国别！")
city = request.form['city'] city = request.form['city']
job_num = request.form['job_num'] job_num = request.form['job_num']
new_value = request.form['new_value'] new_value = request.form['new_value']
......
apps/inves_manage/statistic_analysis_view.py
...@@ -219,11 +219,17 @@ def get_data4(district_li, current_year): ...@@ -219,11 +219,17 @@ def get_data4(district_li, current_year):
else: else:
year_target = jc_obj.money_arrive_target1 year_target = jc_obj.money_arrive_target1
# data = {
# "name": district,
# "data": round(arrive_money / 10000, 2),
# "target": year_target,
# "value": round(arrive_money / 10000 / year_target * 100, 2) if year_target and year_target != 0 else 0
# }
data = { data = {
"name": district, "name": district,
"data": round(arrive_money / 10000, 2), "data": arrive_money,
"target": year_target, "target": year_target,
"value": round(arrive_money / 10000 / year_target * 100, 2) if year_target and year_target != 0 else 0 "value": round(arrive_money / year_target * 100, 2) if year_target and year_target != 0 else 0
} }
data_li4.append(data) data_li4.append(data)
continue continue
...@@ -277,8 +283,8 @@ def get_data5(district_li, current_year): ...@@ -277,8 +283,8 @@ def get_data5(district_li, current_year):
# 综合得分 # 综合得分
def get_data6(district_li, current_year): def get_data6(district_li, data_li1, data_li2, data_li3, data_li4, data_li5):
data_li1, data_li2, data_li3, data_li4, data_li5 = get_data_li(district_li, current_year) # data_li1, data_li2, data_li3, data_li4, data_li5 = get_data_li(district_li, current_year)
data_li6 = [] data_li6 = []
# 项目签约情况得分=完成率（%）*赋分（15 上传后获取）如果小于赋分（15 上传后获取）， # 项目签约情况得分=完成率（%）*赋分（15 上传后获取）如果小于赋分（15 上传后获取），
# 则输出完成率（%）*赋分（15 上传后获取）的结果，否则输出赋分（15） # 则输出完成率（%）*赋分（15 上传后获取）的结果，否则输出赋分（15）
...@@ -415,8 +421,10 @@ def statistic_shanxi_data(): ...@@ -415,8 +421,10 @@ def statistic_shanxi_data():
if flag == 1: if flag == 1:
data = [{ data = [{
"district_name": target_obj.district_name, "district_name": target_obj.district_name,
"sign_money": round(target_obj.sign_money / 10000, 2), # "sign_money": round(target_obj.sign_money / 10000, 2),
"sign_target_money": round(target_obj.sign_target_money / 10000, 2), "sign_money": target_obj.sign_money,
# "sign_target_money": round(target_obj.sign_target_money / 10000, 2),
"sign_target_money": target_obj.sign_target_money,
"sign_finish_rate": round(target_obj.sign_finish_rate, 2), "sign_finish_rate": round(target_obj.sign_finish_rate, 2),
} for target_obj in target_obj_li] } for target_obj in target_obj_li]
data1 = sorted(data, key=lambda x: x['sign_money'], reverse=True) data1 = sorted(data, key=lambda x: x['sign_money'], reverse=True)
...@@ -424,8 +432,10 @@ def statistic_shanxi_data(): ...@@ -424,8 +432,10 @@ def statistic_shanxi_data():
if flag == 2: if flag == 2:
data = [{ data = [{
"district_name": target_obj.district_name, "district_name": target_obj.district_name,
"plan_invest_money": round(target_obj.plan_invest_money / 10000, 2), # "plan_invest_money": round(target_obj.plan_invest_money / 10000, 2),
"plan_target_money": round(target_obj.plan_target_money / 10000, 2), # "plan_target_money": round(target_obj.plan_target_money / 10000, 2),
"plan_invest_money": target_obj.plan_invest_money,
"plan_target_money": target_obj.plan_target_money,
"plan_finish_rate": round(target_obj.plan_finish_rate, 2), "plan_finish_rate": round(target_obj.plan_finish_rate, 2),
} for target_obj in target_obj_li] } for target_obj in target_obj_li]
data1 = sorted(data, key=lambda x: x['plan_invest_money'], reverse=True) data1 = sorted(data, key=lambda x: x['plan_invest_money'], reverse=True)
...@@ -433,8 +443,10 @@ def statistic_shanxi_data(): ...@@ -433,8 +443,10 @@ def statistic_shanxi_data():
if flag == 3: if flag == 3:
data = [{ data = [{
"district_name": target_obj.district_name, "district_name": target_obj.district_name,
"arrive_money": round(target_obj.arrive_money / 10000, 2), # "arrive_money": round(target_obj.arrive_money / 10000, 2),
"arrive_target_money": round(target_obj.arrive_target_money / 10000, 2), "arrive_money": target_obj.arrive_money,
# "arrive_target_money": round(target_obj.arrive_target_money / 10000, 2),
"arrive_target_money": target_obj.arrive_target_money,
"arrive_finish_rate": round(target_obj.arrive_finish_rate, 2) "arrive_finish_rate": round(target_obj.arrive_finish_rate, 2)
} for target_obj in target_obj_li] } for target_obj in target_obj_li]
data1 = sorted(data, key=lambda x: x['arrive_money'], reverse=True) data1 = sorted(data, key=lambda x: x['arrive_money'], reverse=True)
...@@ -461,7 +473,7 @@ def statistic_jc_data(): ...@@ -461,7 +473,7 @@ def statistic_jc_data():
data_li1, data_li2, data_li3, data_li4, data_li5 = get_data_li(district_li, current_year) data_li1, data_li2, data_li3, data_li4, data_li5 = get_data_li(district_li, current_year)
# 六。综合得分 # 六。综合得分
data_li6 = get_data6(district_li, current_year) data_li6 = get_data6(district_li, data_li1, data_li2, data_li3, data_li4, data_li5)
return jsonify(code=RET.OK, return jsonify(code=RET.OK,
data={"data_li1": data_li1, "data_li2": data_li2, data={"data_li1": data_li1, "data_li2": data_li2,
"data_li3": data_li3, "data_li4": data_li4, "data_li3": data_li3, "data_li4": data_li4,
...@@ -512,7 +524,9 @@ def export_jc_data1(data_time, path, pro_path): ...@@ -512,7 +524,9 @@ def export_jc_data1(data_time, path, pro_path):
district_li = ["全市", "城区", "泽州县", "高平市", "阳城县", "陵川县", district_li = ["全市", "城区", "泽州县", "高平市", "阳城县", "陵川县",
"沁水县", "晋城经济技术开发区"] "沁水县", "晋城经济技术开发区"]
# 六。综合得分 # 六。综合得分
data_li6 = get_data6(district_li, current_year) data_li1, data_li2, data_li3, data_li4, data_li5 = get_data_li(district_li, 2022)
data_li6 = get_data6(district_li, data_li1, data_li2, data_li3, data_li4, data_li5)
target_data_list = [] target_data_list = []
try: try:
...@@ -1003,15 +1017,12 @@ def project_graph(): ...@@ -1003,15 +1017,12 @@ def project_graph():
data.append(data_dic) data.append(data_dic)
elif flag == 5: elif flag == 5:
if project_source == '京津冀': if project_source == '京津冀':
num1 = project_obj.filter(or_( num1 = project_obj.filter(
ProjectManagement.investor_district.like('%北京%'), ProjectManagement.investor_district.like("%北京%")).count()
)).count() num2 = project_obj.filter(
num2 = project_obj.filter(or_( ProjectManagement.investor_district.like("%天津%")).count()
ProjectManagement.investor_district.like('%天津%'), num3 = project_obj.filter(
)).count() ProjectManagement.investor_district.like("%河北%")).count()
num3 = project_obj.filter(or_(
ProjectManagement.investor_district.like('%河北%')
)).count()
total_num = sum([num1, num2, num3]) total_num = sum([num1, num2, num3])
data = [ data = [
...@@ -1020,15 +1031,12 @@ def project_graph(): ...@@ -1020,15 +1031,12 @@ def project_graph():
{"name": "河北省", "value": round(num3 / total_num * 100, 2)}, {"name": "河北省", "value": round(num3 / total_num * 100, 2)},
] ]
if project_source == '长三角': if project_source == '长三角':
num1 = project_obj.filter(or_( num1 = project_obj.filter(
ProjectManagement.investor_district.like('%江苏%'), ProjectManagement.investor_district.like('%江苏%')).count()
)).count() num2 = project_obj.filter(
num2 = project_obj.filter(or_( ProjectManagement.investor_district.like('%浙江%')).count()
ProjectManagement.investor_district.like('%浙江%'), num3 = project_obj.filter(
)).count() ProjectManagement.investor_district.like('%上海%')).count()
num3 = project_obj.filter(or_(
ProjectManagement.investor_district.like('%上海%')
)).count()
total_num = sum([num1, num2, num3]) total_num = sum([num1, num2, num3])
data = [ data = [
...@@ -1037,15 +1045,12 @@ def project_graph(): ...@@ -1037,15 +1045,12 @@ def project_graph():
{"name": "上海市", "value": round(num3 / total_num * 100, 2)}, {"name": "上海市", "value": round(num3 / total_num * 100, 2)},
] ]
if project_source == '珠三角': if project_source == '珠三角':
num1 = project_obj.filter(or_( num1 = project_obj.filter(
ProjectManagement.investor_district.like('%广东%'), ProjectManagement.investor_district.like('%广东%')).count()
)).count() num2 = project_obj.filter(
num2 = project_obj.filter(or_( ProjectManagement.investor_district.like('%香港%')).count()
ProjectManagement.investor_district.like('%香港%'), num3 = project_obj.filter(
)).count() ProjectManagement.investor_district.like('%澳门%')).count()
num3 = project_obj.filter(or_(
ProjectManagement.investor_district.like('%澳门%')
)).count()
total_num = sum([num1, num2, num3]) total_num = sum([num1, num2, num3])
data = [ data = [
...@@ -1076,9 +1081,8 @@ def project_graph(): ...@@ -1076,9 +1081,8 @@ def project_graph():
source_data_list = [] source_data_list = []
data = [] data = []
for source in list(source_list): for source in list(source_list):
num = project_obj.filter(or_( num = project_obj.filter(
ProjectManagement.investor_district.like('%{}%'.format(source)), ProjectManagement.investor_district.like('%{}%'.format(source))).count()
)).count()
num_list.append(num) num_list.append(num)
source_data_list.append({"source": source, "num": num}) source_data_list.append({"source": source, "num": num})
total_num = sum(num_list) total_num = sum(num_list)
......
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