Commit d0cca3c4 by dong

fix

parent d0b6d2dd
......@@ -1841,75 +1841,75 @@ def areal_project():
# 首页统计
@api_manage.route("/GetData", methods=["POST"])
def get_data():
req_dic = request.get_json()
flag = req_dic['flag']
data_time = req_dic['data_time']
if data_time:
return jsonify(code=RET.OK, msg="")
if data_time:
current_year = data_time.split('年')[0]
else:
current_year = str(datetime.now().year)
# current_year = "2022"
district_li1 = ["全市", "城区", "泽州县", "高平市", "阳城县",
"陵川县", "沁水县", "晋城经济技术开发区"]
# 获取晋城年度目标表中的最新数据看看是哪一年的
jc_obj_list = JcTarget.query.filter(
# JcTarget.district_name == district if district != '全市' else text(''),
JcTarget.is_delete == 0
).all()
year_list = []
for jc_obj in jc_obj_list:
year_list.append(int(jc_obj.year.split('年')[0]))
max_year = max(set(year_list))
target_data_li = []
if flag == 1: # 签约项目完成情况
try:
target_data_li = get_data1(data_time, district_li1, max_year)
if not data_time:
data_time = str(max_year) + '年'
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!")
if flag == 2: # 项目开工完成情况
try:
target_data_li = get_data2(data_time, district_li1, max_year)
if not data_time:
data_time = str(max_year) + '年'
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!")
if flag == 3: # 新开工项目计划投资额完情况
try:
target_data_li = get_data3(data_time, district_li1, max_year)
if not data_time:
data_time = str(max_year) + '年'
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!")
if flag == 4: # 固投资金完成情况
try:
target_data_li = get_data4(data_time, district_li1, max_year)
if not data_time:
data_time = str(max_year) + '年'
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!")
if flag == 5: # 非固投资金完成情况
try:
target_data_li = get_data5(data_time, district_li1, max_year)
if not data_time:
data_time = str(max_year) + '年'
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误!")
return jsonify(code=RET.OK, msg="ok")
# req_dic = request.get_json()
# flag = req_dic['flag']
# data_time = req_dic['data_time']
#
# if data_time:
# current_year = data_time.split('年')[0]
# else:
# current_year = str(datetime.now().year)
# # current_year = "2022"
# district_li1 = ["全市", "城区", "泽州县", "高平市", "阳城县",
# "陵川县", "沁水县", "晋城经济技术开发区"]
# # 获取晋城年度目标表中的最新数据看看是哪一年的
# jc_obj_list = JcTarget.query.filter(
# # JcTarget.district_name == district if district != '全市' else text(''),
# JcTarget.is_delete == 0
# ).all()
# year_list = []
# for jc_obj in jc_obj_list:
# year_list.append(int(jc_obj.year.split('年')[0]))
# max_year = max(set(year_list))
# target_data_li = []
# if flag == 1: # 签约项目完成情况
# try:
# target_data_li = get_data1(data_time, district_li1, max_year)
# if not data_time:
# data_time = str(max_year) + '年'
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# except Exception as e:
# current_app.logger.error(e)
# return jsonify(code=RET.DBERR, msg="数据查询错误!")
#
# if flag == 2: # 项目开工完成情况
# try:
# target_data_li = get_data2(data_time, district_li1, max_year)
# if not data_time:
# data_time = str(max_year) + '年'
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# except Exception as e:
# current_app.logger.error(e)
# return jsonify(code=RET.DBERR, msg="数据查询错误!")
#
# if flag == 3: # 新开工项目计划投资额完情况
# try:
# target_data_li = get_data3(data_time, district_li1, max_year)
# if not data_time:
# data_time = str(max_year) + '年'
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# except Exception as e:
# current_app.logger.error(e)
# return jsonify(code=RET.DBERR, msg="数据查询错误!")
#
# if flag == 4: # 固投资金完成情况
# try:
# target_data_li = get_data4(data_time, district_li1, max_year)
# if not data_time:
# data_time = str(max_year) + '年'
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# except Exception as e:
# current_app.logger.error(e)
# return jsonify(code=RET.DBERR, msg="数据查询错误!")
#
# if flag == 5: # 非固投资金完成情况
# try:
# target_data_li = get_data5(data_time, district_li1, max_year)
# if not data_time:
# data_time = str(max_year) + '年'
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# except Exception as e:
# current_app.logger.error(e)
# 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