Skip to content

M
mancheng
Commit 9a7e984a by dong
Options

fix20230111

parent b2b6eec6
Showing with 24 additions and 7 deletions
apps/inves_manage/project_manager.py
...@@ -67,6 +67,7 @@ def search_project1(): ...@@ -67,6 +67,7 @@ def search_project1():
project_year = req_dic['project_year'] project_year = req_dic['project_year']
page = req_dic['page'] page = req_dic['page']
per_page = req_dic['per_page'] per_page = req_dic['per_page']
flag = req_dic['flag']
try: try:
user_obj = verify_token(token) user_obj = verify_token(token)
...@@ -76,17 +77,33 @@ def search_project1(): ...@@ -76,17 +77,33 @@ def search_project1():
return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！") return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！")
try: try:
# project_obj = ProjectManagement.query.filter(
# ProjectManagement.project_name.like('%{}%'.format(project_name)) if project_name else text(''),
# ProjectManagement.project_stalker == project_stalker if project_stalker else text(''),
# ProjectManagement.district == district if district else text(''),
# ProjectManagement.development_area == development_area if development_area else text(''),
# ProjectManagement.investment_volume > investment_volume[0] if investment_volume else text(''),
# ProjectManagement.investment_volume <= investment_volume[1] if investment_volume else text(''),
# ProjectManagement.investor_district.like('%{}%'.format(investor_district)) if investor_district else text(
# ''),
# ProjectManagement.industry.like('%{}%'.format(industry1)) if industry1 else text(''),
# ProjectManagement.industry2.like('%{}%'.format(industry2)) if industry2 else text(''),
# ProjectManagement.investor_name.like('%{}%'.format(investor_name)) if investor_name else text(''),
# ProjectManagement.project_progress == project_progress if project_progress else text(''),
# ProjectManagement.project_year == project_year if project_year else text(''),
# ProjectManagement.is_delete == 0
# )
project_obj = ProjectManagement.query.filter( project_obj = ProjectManagement.query.filter(
ProjectManagement.sign_time.notin_(['Null', '']), ProjectManagement.sign_time.notin_(['Null', '']) if flag == 2 else text(''),
ProjectManagement.project_name.like('%{}%'.format(project_name)) if project_name else text(''), ProjectManagement.project_name.like('%{}%'.format(project_name)) if project_name else text(''),
ProjectManagement.project_stalker == project_stalker if project_stalker else text(''), ProjectManagement.project_stalker == project_stalker if project_stalker else text(''),
ProjectManagement.project_stalker != '', ProjectManagement.project_stalker != '' if flag == 2 else text(''),
ProjectManagement.district == district if district else text(''), ProjectManagement.district == district if district else text(''),
ProjectManagement.development_area == development_area if development_area else text(''), ProjectManagement.development_area == development_area if development_area else text(''),
ProjectManagement.investment_volume > investment_volume[0] if investment_volume else text(''), ProjectManagement.investment_volume > investment_volume[0] if investment_volume else text(''),
ProjectManagement.investment_volume <= investment_volume[1] if investment_volume else text(''), ProjectManagement.investment_volume <= investment_volume[1] if investment_volume else text(''),
ProjectManagement.investor_district.like('%{}%'.format(investor_district)) if investor_district else text( ProjectManagement.investor_district.like('%{}%'.format(investor_district)) if investor_district else text(''),
''),
ProjectManagement.industry.like('%{}%'.format(industry1)) if industry1 else text(''), ProjectManagement.industry.like('%{}%'.format(industry1)) if industry1 else text(''),
ProjectManagement.industry2.like('%{}%'.format(industry2)) if industry2 else text(''), ProjectManagement.industry2.like('%{}%'.format(industry2)) if industry2 else text(''),
ProjectManagement.investor_name.like('%{}%'.format(investor_name)) if investor_name else text(''), ProjectManagement.investor_name.like('%{}%'.format(investor_name)) if investor_name else text(''),
...@@ -104,7 +121,6 @@ def search_project1(): ...@@ -104,7 +121,6 @@ def search_project1():
data = [{ data = [{
"id": project_obj.id, "id": project_obj.id,
"project_stalker": project_obj.project_stalker, "project_stalker": project_obj.project_stalker,
"sign_time": project_obj.sign_time,
"project_name": project_obj.project_name, "project_name": project_obj.project_name,
"district": project_obj.district, "district": project_obj.district,
"development_area": project_obj.development_area, "development_area": project_obj.development_area,
...@@ -890,10 +906,11 @@ def shanxi_data_list(): ...@@ -890,10 +906,11 @@ def shanxi_data_list():
return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！") return jsonify(code=RET.SESSIONERR, msg="进行操作时用户信息校验失败，请重新登陆后尝试！")
req_dic = request.get_json() req_dic = request.get_json()
year = req_dic['year'] year = req_dic['year']
current_year = datetime.now().year # current_year = datetime.now().year
# current_year = 2022
try: try:
target_obj_list = ShanxiTarget.query.filter( target_obj_list = ShanxiTarget.query.filter(
ShanxiTarget.data_time.like('%{}%'.format(year) if year else current_year), # ShanxiTarget.data_time.like('%{}%'.format(year) if year else current_year),
ShanxiTarget.is_delete == 0 ShanxiTarget.is_delete == 0
).all() ).all()
data_time_set = set(target_obj.data_time for target_obj in target_obj_list) data_time_set = set(target_obj.data_time for target_obj in target_obj_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