Commit e7cdde6d by dong

fix20230202

parent 3d8d6a83
...@@ -1379,203 +1379,52 @@ def areal_project(): ...@@ -1379,203 +1379,52 @@ def areal_project():
def get_data(): def get_data():
req_dic = request.get_json() req_dic = request.get_json()
flag = req_dic['flag'] flag = req_dic['flag']
# current_year = str(datetime.now().year) current_year = str(datetime.now().year)
current_year = "2022" # current_year = "2022"
district_li1 = ["全市", "城区", "泽州县", "高平市", "阳城县", district_li1 = ["全市", "城区", "泽州县", "高平市", "阳城县",
"陵川县", "沁水县", "晋城经济技术开发区"] "陵川县", "沁水县", "晋城经济技术开发区"]
now_time = (datetime.now() - relativedelta(years=1)).strftime('%Y-%m-%d')
now_time = now_time.split('-')
data_time = now_time[0] + '年' + now_time[1] + '月' + now_time[2] + '号-至今'
target_data_li = [] target_data_li = []
if flag == 1: # 签约项目完成情况 if flag == 1: # 签约项目完成情况
try: try:
# for district in district_li1:
# data = {}
# project_obj = ProjectManagement.query.filter(
# ProjectManagement.sign_time.like('%{}%'.format(current_year)),
# ProjectManagement.is_delete == 0,
# ProjectManagement.district.like('%{}%'.format(str(district))) if district != '全市' else text('')
# )
# # 区县
# data.update({"district": district})
# # 年度目标
# jc_obj = JcTarget.query.filter(JcTarget.year.like('%{}%'.format(current_year)),
# JcTarget.is_delete == 0,
# JcTarget.district_name.like('%{}%'.format(str(district))) if district != '全市' else text('')).first()
# target = 0
# if jc_obj:
# target = jc_obj.money_sign
# data.update({"target": target})
# # 签约金额(亿元)
# project_obj_list = project_obj.all()
# if not project_obj_list:
# sign_money = 0
# else:
# sign_money = sum([project_obj.investment_volume / 10000 for project_obj in project_obj_list])
# data.update({"value": round(sign_money, 2)})
#
# # 签约完成率
# rate = round(sign_money / target * 100, 2) if target and target != 0 else 0
# data.update({"rate": rate})
# target_data_li.append(data)
target_data_li = get_data1([], district_li1, current_year) target_data_li = get_data1([], district_li1, current_year)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!") return jsonify(code=RET.DBERR, msg="数据查询错误!")
if flag == 2: # 项目开工完成情况 if flag == 2: # 项目开工完成情况
try: try:
# for district in district_li1:
# data = {}
# # 区县
# data.update({"district": district})
# project_obj = ProjectManagement.query.filter(
# ProjectManagement.sign_time.like('%{}%'.format(current_year)),
# ProjectManagement.is_delete == 0,
# ProjectManagement.district.like('%{}%'.format(str(district))) if district != '全市' else text('')
# )
# # 签约个数
# sign_num = project_obj.count()
# data.update({"value": sign_num})
# # 当年开工个数
# target = ProjectManagement.query.filter(
# ProjectManagement.start_time.like('%{}%'.format(current_year)),
# ProjectManagement.is_delete == 0,
# ProjectManagement.district.like('%{}%'.format(str(district))) if district != '全市' else text('')
# ).count()
# data.update({"target": target})
#
# # 开工率进度(40 %)
# rate = round(target / sign_num * 100, 2) if sign_num and sign_num != 0 else 0
# data.update({"rate": rate})
# target_data_li.append(data)
target_data_li = get_data2([], district_li1, current_year) target_data_li = get_data2([], district_li1, current_year)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!") return jsonify(code=RET.DBERR, msg="数据查询错误!")
if flag == 3: # 新开工项目计划投资额完情况 if flag == 3: # 新开工项目计划投资额完情况
try: try:
# for district in district_li1:
# data = {}
# # 区县
# data.update({"district": district})
# # 新开工项目计划投资额(亿元)
# project_obj_list = ProjectManagement.query.filter(
# ProjectManagement.sign_time.like('%{}%'.format(current_year)),
# ProjectManagement.is_delete == 0,
# ProjectManagement.district.like('%{}%'.format(district)) if district != '全市' else text('')
# ).all()
# if not project_obj_list:
# new_start_money = 0
# else:
# new_start_money = sum([project_obj.investment_volume / 10000 for project_obj in project_obj_list])
# data.update({"value": round(new_start_money, 2)})
#
# # 新开工年度目标
# jc_obj = JcTarget.query.filter(
# JcTarget.district_name == district if district != '全市' else text(''),
# JcTarget.year.like('%{}%'.format(current_year)),
# JcTarget.is_delete == 0
# ).first()
# if not jc_obj:
# target = 0
# else:
# target = jc_obj.money_plan_invest
# data.update({"target": target})
#
# # 新开工完成率
# rate = round(new_start_money / target * 100, 2) if target and target != 0 else 0
# data.update({"rate": rate})
# target_data_li.append(data)
target_data_li = get_data3([], district_li1, current_year) target_data_li = get_data3([], district_li1, current_year)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!") return jsonify(code=RET.DBERR, msg="数据查询错误!")
if flag == 4: # 固投资金完成情况 if flag == 4: # 固投资金完成情况
try: try:
# for district in district_li1:
# data = {}
# # 区县
# data.update({"district": district})
# # 固定资产投资项目资金到位额(亿元)
# money_obj_li = MoneyArrive.query.filter_by(is_delete=0).all()
# max_id = max([money_obj.id for money_obj in money_obj_li])
# data_time_obj = MoneyArrive.query.get(max_id)
# data_time = data_time_obj.data_time
# project_obj = MoneyArrive.query.filter(
# MoneyArrive.data_time == data_time,
# MoneyArrive.is_delete == 0,
# MoneyArrive.district_name.like('%{}%'.format(str(district))) if district != '全市' else text('')
# ).first()
# if not project_obj:
# gutou1_money = 0
# else:
# gutou1_money = project_obj.arrive_money
# data.update({"value": gutou1_money})
#
# # 年度目标
# jc_obj = JcTarget.query.filter(
# JcTarget.district_name == district if district != '全市' else text(''),
# JcTarget.year.like('%{}%'.format(str(current_year))),
# JcTarget.is_delete == 0
# ).first()
# if not jc_obj:
# gutou1_target = 0
# else:
# gutou1_target = jc_obj.money_arrive_target1
# data.update({"target": gutou1_target})
#
# # 完成率
# gutou1_rate = round(gutou1_money / gutou1_target * 100, 2) if gutou1_target and gutou1_target != 0 else 0
# data.update({"rate": gutou1_rate})
# target_data_li.append(data)
target_data_li = get_data4([], district_li1, current_year) target_data_li = get_data4([], district_li1, current_year)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!") return jsonify(code=RET.DBERR, msg="数据查询错误!")
if flag == 5: # 非固投资金完成情况 if flag == 5: # 非固投资金完成情况
try: try:
# for district in district_li1:
# data = {}
# # 区县
# data.update({"district": district})
# # 非固定资产投资项目资金到位额(亿元)
# project_obj_list = ProjectManagement.query.filter(
# ProjectManagement.is_fixed_investment == '否',
# ProjectManagement.sign_time.like('%{}%'.format(current_year)),
# ProjectManagement.is_delete == 0,
# ProjectManagement.district.like('%{}%'.format(str(district))) if district != '全市' else text('')
# ).all()
# if not project_obj_list:
# gutou0_money = 0
# else:
# gutou0_money = sum([project_obj.investment_volume / 10000 for project_obj in project_obj_list])
# data.update({"value": round(gutou0_money, 2)})
#
# # 年度目标
# jc_obj = JcTarget.query.filter(
# JcTarget.district_name == district,
# JcTarget.year.like('%{}%'.format(current_year)),
# JcTarget.is_delete == 0
# ).first()
# if not jc_obj:
# gutou0_target = 0
# else:
# gutou0_target = jc_obj.money_arrive_target0
# data.update({"target": gutou0_target})
#
# # 完成率
# gutou0_rate = round(gutou0_money / gutou0_target * 100, 2) if gutou0_target and gutou0_target != 0 else 0
# data.update({"rate": gutou0_rate})
# target_data_li.append(data)
target_data_li = get_data5([], district_li1, current_year) target_data_li = get_data5([], district_li1, current_year)
return jsonify(code=RET.OK, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!") return jsonify(code=RET.DBERR, msg="数据查询错误!")
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