Skip to content

M
mancheng
Commit 771902a1 by dong
Options

fix

parent e2c40e75
Showing with 117 additions and 106 deletions
apps/inves_manage/statistic_analysis_view.py
...@@ -49,7 +49,7 @@ def get_data1(data_time, district_li, max_year): ...@@ -49,7 +49,7 @@ def get_data1(data_time, district_li, max_year):
now_time4 = '' now_time4 = ''
for district in district_li: for district in district_li:
if not data_time: if not data_time:
# 获取晋城年度目标表中的最新数据看看是哪一年的 # 获取mc年度目标表中的最新数据看看是哪一年的
jc_obj_list = JcTarget.query.filter( jc_obj_list = JcTarget.query.filter(
JcTarget.district_name == district, JcTarget.district_name == district,
JcTarget.is_delete == 0 JcTarget.is_delete == 0
...@@ -778,7 +778,7 @@ def get_data5(data_time, district_li, max_year): ...@@ -778,7 +778,7 @@ def get_data5(data_time, district_li, max_year):
if not project_obj_list: if not project_obj_list:
investment_volume = 0 investment_volume = 0
else: else:
investment_volume = sum([float(project_obj.investment_year) for project_obj in project_obj_list]) investment_volume = sum([float(project_obj.investment_volume) for project_obj in project_obj_list])
# 年度目标 # 年度目标
jc_obj = JcTarget.query.filter( jc_obj = JcTarget.query.filter(
JcTarget.district_name == district, JcTarget.district_name == district,
...@@ -1550,7 +1550,7 @@ def project_graph(): ...@@ -1550,7 +1550,7 @@ def project_graph():
{"name": "第三产业", "value": round(project_count3 / total_num * 100, 2)}, {"name": "第三产业", "value": round(project_count3 / total_num * 100, 2)},
] ]
elif flag == 4: elif flag == 4:
industry_list = ["传统产业升级改造", "现代农业", "战略性新兴产业", "现代服务业", "文化旅游产业"] industry_list = ["造纸及纸制品", "文化旅游", "轨道交通装备", "新材料", "生物医药健康", "教育和体育", "现代商贸物流", "食品加工", "电力电气"]
data = [] data = []
num_li = [] num_li = []
for industry in industry_list: for industry in industry_list:
...@@ -1583,9 +1583,9 @@ def project_graph(): ...@@ -1583,9 +1583,9 @@ def project_graph():
total_num = sum([num1, num2, num3]) total_num = sum([num1, num2, num3])
data = [ data = [
{"name": "江苏省", "value": round(num1 / total_num * 100, 2)}, {"name": "江苏省", "value": round(num1 / total_num * 100, 2) if total_num != 0 else 0},
{"name": "浙江省", "value": round(num2 / total_num * 100, 2)}, {"name": "浙江省", "value": round(num2 / total_num * 100, 2) if total_num != 0 else 0},
{"name": "上海市", "value": round(num3 / total_num * 100, 2)}, {"name": "上海市", "value": round(num3 / total_num * 100, 2) if total_num != 0 else 0},
] ]
if project_source == '珠三角': if project_source == '珠三角':
num1 = project_obj.filter( num1 = project_obj.filter(
...@@ -1597,9 +1597,9 @@ def project_graph(): ...@@ -1597,9 +1597,9 @@ def project_graph():
total_num = sum([num1, num2, num3]) total_num = sum([num1, num2, num3])
data = [ data = [
{"name": "广东省", "value": round(num1 / total_num * 100, 2)}, {"name": "广东省", "value": round(num1 / total_num * 100, 2) if total_num != 0 else 0},
{"name": "香港特别行政区", "value": round(num2 / total_num * 100, 2)}, {"name": "香港特别行政区", "value": round(num2 / total_num * 100, 2) if total_num != 0 else 0},
{"name": "澳门特别行政区", "value": round(num3 / total_num * 100, 2)}, {"name": "澳门特别行政区", "value": round(num3 / total_num * 100, 2) if total_num != 0 else 0},
] ]
if project_source == '中原经济区': if project_source == '中原经济区':
project_obj_list = project_obj.filter(or_( project_obj_list = project_obj.filter(or_(
...@@ -1841,75 +1841,77 @@ def areal_project(): ...@@ -1841,75 +1841,77 @@ def areal_project():
# 首页统计 # 首页统计
@api_manage.route("/GetData", methods=["POST"]) @api_manage.route("/GetData", methods=["POST"])
def get_data(): def get_data():
return jsonify(code=RET.OK, data={"target_data_li": [], "data_time": ''}, msg='数据查询成功。') # return jsonify(code=RET.OK, data={"target_data_li": [], "data_time": ''}, msg='数据查询成功。')
# req_dic = request.get_json() req_dic = request.get_json()
# flag = req_dic['flag'] flag = req_dic['flag']
# data_time = req_dic['data_time'] data_time = req_dic['data_time']
#
# if data_time: if data_time:
# current_year = data_time.split('年')[0] current_year = data_time.split('年')[0]
# else: else:
# current_year = str(datetime.now().year) current_year = str(datetime.now().year)
# # current_year = "2022" # current_year = "2022"
# district_li1 = ["全市", "城区", "泽州县", "高平市", "阳城县", district_li1 = ["全市", "满城镇", "刘家台乡", "神星镇", "坨南乡",
# "陵川县", "沁水县", "晋城经济技术开发区"] "白龙乡", "大册营镇", "要庄乡", "石井乡", "南韩村镇",
# # 获取晋城年度目标表中的最新数据看看是哪一年的 "于家庄镇", "方顺桥镇", "河北满城经济开发区"
# jc_obj_list = JcTarget.query.filter( ]
# # JcTarget.district_name == district if district != '全市' else text(''), # 获取晋城年度目标表中的最新数据看看是哪一年的
# JcTarget.is_delete == 0 jc_obj_list = JcTarget.query.filter(
# ).all() # JcTarget.district_name == district if district != '全市' else text(''),
# year_list = [] JcTarget.is_delete == 0
# for jc_obj in jc_obj_list: ).all()
# year_list.append(int(jc_obj.year.split('年')[0])) year_list = []
# max_year = max(set(year_list)) for jc_obj in jc_obj_list:
# target_data_li = [] year_list.append(int(jc_obj.year.split('年')[0]))
# if flag == 1: # 签约项目完成情况 max_year = max(set(year_list))
# try: target_data_li = []
# target_data_li = get_data1(data_time, district_li1, max_year) if flag == 1: # 签约项目完成情况
# if not data_time: try:
# data_time = str(max_year) + '年' target_data_li = get_data1(data_time, district_li1, max_year)
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。') if not data_time:
# except Exception as e: data_time = str(max_year) + '年'
# current_app.logger.error(e) return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# return jsonify(code=RET.DBERR, msg="数据查询错误！") except Exception as e:
# current_app.logger.error(e)
# if flag == 2: # 项目开工完成情况 return jsonify(code=RET.DBERR, msg="数据查询错误！")
# try:
# target_data_li = get_data2(data_time, district_li1, max_year) if flag == 2: # 项目开工完成情况
# if not data_time: try:
# data_time = str(max_year) + '年' target_data_li = get_data2(data_time, district_li1, max_year)
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。') if not data_time:
# except Exception as e: data_time = str(max_year) + '年'
# current_app.logger.error(e) return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# return jsonify(code=RET.DBERR, msg="数据查询错误！") except Exception as e:
# current_app.logger.error(e)
# if flag == 3: # 新开工项目计划投资额完情况 return jsonify(code=RET.DBERR, msg="数据查询错误！")
# try:
# target_data_li = get_data3(data_time, district_li1, max_year) if flag == 3: # 新开工项目计划投资额完情况
# if not data_time: try:
# data_time = str(max_year) + '年' target_data_li = get_data3(data_time, district_li1, max_year)
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。') if not data_time:
# except Exception as e: data_time = str(max_year) + '年'
# current_app.logger.error(e) return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# return jsonify(code=RET.DBERR, msg="数据查询错误！") except Exception as e:
# current_app.logger.error(e)
# if flag == 4: # 固投资金完成情况 return jsonify(code=RET.DBERR, msg="数据查询错误！")
# try:
# target_data_li = get_data4(data_time, district_li1, max_year) if flag == 4: # 固投资金完成情况
# if not data_time: try:
# data_time = str(max_year) + '年' target_data_li = get_data4(data_time, district_li1, max_year)
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。') if not data_time:
# except Exception as e: data_time = str(max_year) + '年'
# current_app.logger.error(e) return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# return jsonify(code=RET.DBERR, msg="数据查询错误！") except Exception as e:
# current_app.logger.error(e)
# if flag == 5: # 非固投资金完成情况 return jsonify(code=RET.DBERR, msg="数据查询错误！")
# try:
# target_data_li = get_data5(data_time, district_li1, max_year) if flag == 5: # 非固投资金完成情况
# if not data_time: try:
# data_time = str(max_year) + '年' target_data_li = get_data5(data_time, district_li1, max_year)
# return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。') if not data_time:
# except Exception as e: data_time = str(max_year) + '年'
# current_app.logger.error(e) return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
# return jsonify(code=RET.DBERR, msg="数据查询错误！") except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误！")
apps/inves_manage/view.py
...@@ -89,8 +89,8 @@ def project_stalker(): ...@@ -89,8 +89,8 @@ def project_stalker():
def project_map(): def project_map():
req_dic = request.get_json() req_dic = request.get_json()
district_name = req_dic['district_name'] district_name = req_dic['district_name']
# current_year = datetime.now().year current_year = str(datetime.now().year)
current_year = '2022' # current_year = '2023'
try: try:
project_obj_count1 = 0 project_obj_count1 = 0
project_obj_count2 = 0 project_obj_count2 = 0
......
apps/view_choose/choose_view.py
...@@ -103,7 +103,7 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name, ...@@ -103,7 +103,7 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name,
if key_words: if key_words:
carrier_obj = CarrierLand.query.filter( carrier_obj = CarrierLand.query.filter(
and_(CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''), and_(CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierLand.district_name == district_name if district_name != '满城区' else text(''),
CarrierLand.land_nature.like('%{}%'.format(land_nature)) if land_nature else text(''), CarrierLand.land_nature.like('%{}%'.format(land_nature)) if land_nature else text(''),
CarrierLand.audit_status == 1 CarrierLand.audit_status == 1
)).filter( )).filter(
...@@ -114,7 +114,7 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name, ...@@ -114,7 +114,7 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name,
else: else:
carrier_obj = CarrierLand.query.filter( carrier_obj = CarrierLand.query.filter(
CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''), CarrierLand.land_name.like('%{}%'.format(land_name)) if land_name else text(''),
CarrierLand.district_name == district_name if district_name != '晋城市' else text(''), CarrierLand.district_name == district_name if district_name != '满城区' else text(''),
CarrierLand.land_nature == land_nature if land_nature else text(''), CarrierLand.land_nature == land_nature if land_nature else text(''),
CarrierLand.audit_status == 1 CarrierLand.audit_status == 1
) )
...@@ -262,23 +262,33 @@ def get_district_name(token): ...@@ -262,23 +262,33 @@ def get_district_name(token):
district_name1 = user_obj.belong_organization # 所属区县 district_name1 = user_obj.belong_organization # 所属区县
if not district_name1: if not district_name1:
return jsonify(code=RET.NODATA, msg="权限错误，请设置用户所属单位！") return jsonify(code=RET.NODATA, msg="权限错误，请设置用户所属单位！")
if '晋城市' in district_name1: if '满城区' in district_name1:
return "晋城市" return "满城区"
else: else:
if '沁水' in district_name1: if '满城镇' in district_name1:
return '沁水县' return '满城镇'
if '高平' in district_name1: if '刘家台乡' in district_name1:
return '高平市' return '刘家台乡'
if '阳城' in district_name1: if '神星镇' in district_name1:
return '阳城县' return '神星镇'
if '陵川' in district_name1: if '坨南乡' in district_name1:
return '陵川县' return '坨南乡'
if '泽州' in district_name1: if '白龙乡' in district_name1:
return '泽州县' return '白龙乡'
if '城区' in district_name1: if '大册营镇' in district_name1:
return '城区' return '大册营镇'
if '晋城经济技' in district_name1: if '要庄乡' in district_name1:
return '晋城经济技术开发区' return '要庄乡'
if '石井乡' in district_name1:
return '石井乡'
if '南韩村镇' in district_name1:
return '南韩村镇'
if '于家庄镇' in district_name1:
return '于家庄镇'
if '方顺桥镇' in district_name1:
return '方顺桥镇'
if '河北满城经济开发区' in district_name1:
return '河北满城经济开发区'
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="token过期，请重新登录！") return jsonify(code=RET.SESSIONERR, msg="token过期，请重新登录！")
......
apps/view_choose/map_view.py
...@@ -254,9 +254,8 @@ def month_rate(): ...@@ -254,9 +254,8 @@ def month_rate():
# 当年产业用地面积 # 当年产业用地面积
# upload_time = '2022-01-01 00:00:00' # upload_time = '2022-01-01 00:00:00'
upload_time = '' upload_time = ''
if district_name == '晋城市': if district_name == '满城区':
district_name_list = ["沁水县", "高平市", "陵川县", "阳城县", district_name_list = ["满城区", "满城镇", "神星镇", "方顺桥镇", "南韩村镇", "大册营镇", "于家庄镇", "要庄乡", "石井乡", "坨南乡", "白龙乡", "刘家台乡"]
"泽州县", "城区", "晋城经济技术开发区"]
for district_name in district_name_list: for district_name in district_name_list:
land_area_obj_list = com.get_total_land_area('', '', district_name, '', upload_time) land_area_obj_list = com.get_total_land_area('', '', district_name, '', upload_time)
land_total_area = sum([float(land_area_obj.total_area if land_area_obj.total_area else 0) for land_area_obj in land_area_obj_list]) land_total_area = sum([float(land_area_obj.total_area if land_area_obj.total_area else 0) for land_area_obj in land_area_obj_list])
......
apps/view_user/view.py
...@@ -226,8 +226,8 @@ def login_bypwd(): ...@@ -226,8 +226,8 @@ def login_bypwd():
# 参数获取与校验 # 参数获取与校验
req_dict = request.get_json() req_dict = request.get_json()
# 解密 # 解密
param = req_dict.get("param") # 加密参数 # param = req_dict.get("param") # 加密参数
req_dict = json.loads(decrypt(param)) # req_dict = json.loads(decrypt(param))
mobile = req_dict.get('mobile') mobile = req_dict.get('mobile')
password = req_dict.get('password') password = req_dict.get('password')
# 校验参数完整性 # 校验参数完整性
......
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