Skip to content

M
mancheng
Commit aa982c04 by dong
Options

fix20221219

parent aa49c999
Showing with 28 additions and 9 deletions
apps/inves_manage/project_manager.py
...@@ -82,8 +82,8 @@ def search_project1(): ...@@ -82,8 +82,8 @@ def search_project1():
ProjectManagement.project_stalker == project_stalker if project_stalker else text(''), ProjectManagement.project_stalker == project_stalker if project_stalker 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(''),
...@@ -410,8 +410,6 @@ def batch_export_project5(): ...@@ -410,8 +410,6 @@ def batch_export_project5():
path = './apps/static/project_file/' path = './apps/static/project_file/'
pro_path = 'http://39.100.39.50:5050/static/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/static/project_file/' # 项目路径
# pro_path = 'http://192.168.1.4:5000/statics/project_file/' # 项目路径 # pro_path = 'http://192.168.1.4:5000/statics/project_file/' # 项目路径
if not select_id_list: if not select_id_list:
return jsonify(code=RET.PARAMERR, msg="参数不能为空！") return jsonify(code=RET.PARAMERR, msg="参数不能为空！")
......
apps/inves_manage/siku_view.py
...@@ -112,13 +112,19 @@ def upload_xiansuo_project(row_content, time_strf, upload_time, upload_unity, up ...@@ -112,13 +112,19 @@ def upload_xiansuo_project(row_content, time_strf, upload_time, upload_unity, up
) )
db.session.add(new_project_obj) db.session.add(new_project_obj)
db.session.commit() db.session.commit()
project_id = new_project_obj.id
# 记录项目动态
time1 = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
write_dynamic(upload_people, project_id, '导入了项目', time1)
return 'continue' return 'continue'
except Exception as e: except Exception as e:
return 'error1' return 'error1'
# 更新对接库 # 更新对接库
def update_joint_project(row_content): def update_joint_project(upload_people, row_content):
try: try:
project_num = row_content[0] # 项目名称 project_num = row_content[0] # 项目名称
project_name = row_content[1] # 项目名称 project_name = row_content[1] # 项目名称
...@@ -152,6 +158,7 @@ def update_joint_project(row_content): ...@@ -152,6 +158,7 @@ def update_joint_project(row_content):
project_obj = SikuProject.query.filter_by( project_obj = SikuProject.query.filter_by(
project_num=project_num).first() # 项目编号 project_num=project_num).first() # 项目编号
project_id = project_obj.id
# 更新项目信息 # 更新项目信息
project_obj.thread_progress = '对接中', project_obj.thread_progress = '对接中',
...@@ -179,13 +186,17 @@ def update_joint_project(row_content): ...@@ -179,13 +186,17 @@ def update_joint_project(row_content):
project_obj.project_people_unity = project_people_unity project_obj.project_people_unity = project_people_unity
project_obj.project_people_mobile = project_people_mobile project_obj.project_people_mobile = project_people_mobile
db.session.commit() db.session.commit()
# 记录项目动态
time1 = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
write_dynamic(upload_people, project_id, '更新了对接库', time1)
return 'continue' return 'continue'
except Exception as e: except Exception as e:
return 'error1' return 'error1'
# 更新签约库 # 更新签约库
def update_sign_project(row_content): def update_sign_project(upload_people, row_content):
try: try:
project_num = row_content[0] # 项目编号 project_num = row_content[0] # 项目编号
project_name = row_content[1] # 项目名称 project_name = row_content[1] # 项目名称
...@@ -228,6 +239,7 @@ def update_sign_project(row_content): ...@@ -228,6 +239,7 @@ def update_sign_project(row_content):
project_obj = SikuProject.query.filter_by( project_obj = SikuProject.query.filter_by(
project_num=project_num).first() # 项目编号 project_num=project_num).first() # 项目编号
project_id = project_obj.id
# 更新项目信息 # 更新项目信息
project_obj.project_name = project_name project_obj.project_name = project_name
...@@ -264,13 +276,17 @@ def update_sign_project(row_content): ...@@ -264,13 +276,17 @@ def update_sign_project(row_content):
project_obj.project_people_unity = project_people_unity project_obj.project_people_unity = project_people_unity
project_obj.project_people_mobile = project_people_mobile project_obj.project_people_mobile = project_people_mobile
db.session.commit() db.session.commit()
# 记录项目动态
time1 = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
write_dynamic(upload_people, project_id, '更新了签约库', time1)
return 'continue' return 'continue'
except Exception as e: except Exception as e:
return 'error1' return 'error1'
# 更新开工库 # 更新开工库
def update_star_project(row_content): def update_star_project(upload_people, row_content):
try: try:
project_num = row_content[0] # 项目编号 project_num = row_content[0] # 项目编号
project_name = row_content[1] # 项目名称 project_name = row_content[1] # 项目名称
...@@ -311,6 +327,7 @@ def update_star_project(row_content): ...@@ -311,6 +327,7 @@ def update_star_project(row_content):
project_obj = SikuProject.query.filter_by( project_obj = SikuProject.query.filter_by(
project_num=project_num).first() # 项目编号 project_num=project_num).first() # 项目编号
project_id = project_obj.id
# 更新项目信息 # 更新项目信息
project_obj.project_num = project_num project_obj.project_num = project_num
...@@ -346,6 +363,10 @@ def update_star_project(row_content): ...@@ -346,6 +363,10 @@ def update_star_project(row_content):
project_obj.project_people_mobile = project_people_mobile project_obj.project_people_mobile = project_people_mobile
project_obj.remark = remark project_obj.remark = remark
db.session.commit() db.session.commit()
# 记录项目动态
time1 = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
write_dynamic(upload_people, project_id, '更新了开工库', time1)
return 'continue' return 'continue'
except Exception as e: except Exception as e:
return 'error1' return 'error1'
...@@ -809,7 +830,7 @@ def upload_project_data1(): ...@@ -809,7 +830,7 @@ def upload_project_data1():
return jsonify(code=RET.NODATA, return jsonify(code=RET.NODATA,
msg="表格内无有效数据！") msg="表格内无有效数据！")
ret = update_joint_project(row_content) ret = update_joint_project(upload_people, row_content)
if ret == 'continue': if ret == 'continue':
update_num += 1 update_num += 1
continue continue
...@@ -828,7 +849,7 @@ def upload_project_data1(): ...@@ -828,7 +849,7 @@ def upload_project_data1():
return jsonify(code=RET.NODATA, return jsonify(code=RET.NODATA,
msg="表格内无有效数据！") msg="表格内无有效数据！")
ret = update_sign_project(row_content) ret = update_sign_project(upload_people, row_content)
if ret == 'continue': if ret == 'continue':
update_num += 1 update_num += 1
continue continue
......
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