Skip to content

M
mancheng
Commit c59cb590 by dong
Options

fix20221115

parent b095b72d
Showing with 49 additions and 6 deletions
apps/inves_manage/view.py
...@@ -606,6 +606,8 @@ def batch_del(): ...@@ -606,6 +606,8 @@ def batch_del():
try: try:
for select_id in select_id_list: for select_id in select_id_list:
project_obj = SikuProject.query.get(select_id) project_obj = SikuProject.query.get(select_id)
if not project_obj:
return jsonify(code=RET.NODATA, msg="查无此数据！")
project_obj.is_delete = 1 project_obj.is_delete = 1
db.session.commit() db.session.commit()
continue continue
...@@ -758,6 +760,8 @@ def distribute_project(): ...@@ -758,6 +760,8 @@ def distribute_project():
try: try:
for district in district_list: for district in district_list:
old_project_obj = SikuProject.query.get(project_id) old_project_obj = SikuProject.query.get(project_id)
if not old_project_obj:
return jsonify(code=RET.NODATA, msg="查无此数据！")
old_distribute_condition = old_project_obj.distribute_condition old_distribute_condition = old_project_obj.distribute_condition
if old_distribute_condition and old_distribute_condition == district: if old_distribute_condition and old_distribute_condition == district:
continue continue
...@@ -785,6 +789,7 @@ def distribute_project(): ...@@ -785,6 +789,7 @@ def distribute_project():
else: else:
project_num = time_strf + '001' project_num = time_strf + '001'
new_project = SikuProject( new_project = SikuProject(
thread_progress='对接中',
is_delete=0, is_delete=0,
flag=2, flag=2,
distribute_condition=district, distribute_condition=district,
...@@ -798,7 +803,7 @@ def distribute_project(): ...@@ -798,7 +803,7 @@ def distribute_project():
thread_people=old_project_obj.thread_people, thread_people=old_project_obj.thread_people,
thread_people_unity=old_project_obj.thread_people_unity, thread_people_unity=old_project_obj.thread_people_unity,
thread_people_mobile=old_project_obj.thread_people_mobile, thread_people_mobile=old_project_obj.thread_people_mobile,
thread_progress=old_project_obj.thread_progress, # thread_progress=old_project_obj.thread_progress,
upload_unity=old_project_obj.upload_unity, upload_unity=old_project_obj.upload_unity,
upload_people=old_project_obj.upload_people, upload_people=old_project_obj.upload_people,
upload_time=old_project_obj.upload_time, upload_time=old_project_obj.upload_time,
...@@ -815,7 +820,11 @@ def distribute_project(): ...@@ -815,7 +820,11 @@ def distribute_project():
db.session.add(new_project) db.session.add(new_project)
db.session.commit() db.session.commit()
district_list1.append(district) district_list1.append(district)
return jsonify(code=RET.OK, msg="该项目已分发至{}对接库。".format(district_list1)) if district_list1:
return jsonify(code=RET.OK, msg="该项目已分发至 {} 对接库。".format(district_list1))
else:
return jsonify(code=RET.NODATA, msg="不可重复分发！".format(district_list1))
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DATAERR, msg="分发操作出错！") return jsonify(code=RET.DATAERR, msg="分发操作出错！")
...@@ -836,6 +845,9 @@ def get_project_detail(): ...@@ -836,6 +845,9 @@ def get_project_detail():
try: try:
project_obj = SikuProject.query.get(project_id) project_obj = SikuProject.query.get(project_id)
if not project_obj:
return jsonify(code=RET.NODATA, msg="查无此数据！")
data = { data = {
"project_name": project_obj.project_name, "project_name": project_obj.project_name,
"investor_name": project_obj.investor_name, "investor_name": project_obj.investor_name,
...@@ -862,7 +874,7 @@ def get_project_detail(): ...@@ -862,7 +874,7 @@ def get_project_detail():
return jsonify(code=RET.OK, data=data, msg="项目详情获取成功！") return jsonify(code=RET.OK, data=data, msg="项目详情获取成功！")
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DATAERR, msg="分发操作出错！") return jsonify(code=RET.DATAERR, msg="数据查询失败！")
# 编辑项目详情 # 编辑项目详情
...@@ -872,6 +884,8 @@ def edit_project_detail(): ...@@ -872,6 +884,8 @@ def edit_project_detail():
project_id = req_dic['project_id'] project_id = req_dic['project_id']
try: try:
project_obj = SikuProject.query.get(project_id) project_obj = SikuProject.query.get(project_id)
if not project_obj:
return jsonify(code=RET.NODATA, msg="查无此数据！")
project_obj.project_name = req_dic['project_name'] project_obj.project_name = req_dic['project_name']
project_obj.investor_name = req_dic['investor_name'] project_obj.investor_name = req_dic['investor_name']
project_obj.investor_district = req_dic['investor_district'] project_obj.investor_district = req_dic['investor_district']
...@@ -896,12 +910,41 @@ def edit_project_detail(): ...@@ -896,12 +910,41 @@ def edit_project_detail():
return jsonify(code=RET.DATAERR, msg="编辑操作出错！") return jsonify(code=RET.DATAERR, msg="编辑操作出错！")
# 转办功能 # 转办功能(转办个其他区县，改变拟落地区域字段内容)
@api_manage.route("/ProjectTransition", methods=["POST"]) @api_manage.route("/ProjectTransition", methods=["POST"])
def project_transition(): def project_transition():
token = request.headers['token']
try:
user_obj = verify_token(token)
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
req_dic = request.get_json() req_dic = request.get_json()
project_id = req_dic['project_id'] project_id = req_dic['project_id']
flag = req_dic['flag'] # 2为对接库，3为签约库，4为开工库 flag = req_dic['flag'] # 当前位置：2为对接库，3为签约库
district = req_dic['district']
try:
project_obj = SikuProject.query.filter_by(id=project_id, flag=flag).first()
if not project_obj:
return jsonify(code=RET.NODATA, msg="查无此数据！")
if flag == 2:
# 对接库 转办：把选定的项目转给其它县区，此项目的拟落地区域，变为新的县区
project_obj.project_to_area = district
db.session.commit()
if flag == 3:
# 签约库 转办：把选定的项目转给其它县区，
# 此项目从签约库消除，由其它县区在对接库重新对接，此项目的拟落地区域，变为新的县区
project_obj.project_to_area = district
project_obj.flag = 2
db.session.commit()
return jsonify(code=RET.OK, msg="转办成功！")
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DATAERR, msg="转办操作出错！")
pass pass
......
apps/models.py
...@@ -1053,7 +1053,7 @@ class SikuProject(db.Model): # 四库管理-项目信息表 ...@@ -1053,7 +1053,7 @@ class SikuProject(db.Model): # 四库管理-项目信息表
thread_people = db.Column(db.String(30), comment='线索提供人') thread_people = db.Column(db.String(30), comment='线索提供人')
thread_people_unity = db.Column(db.String(30), comment='线索提供人单位或职务') thread_people_unity = db.Column(db.String(30), comment='线索提供人单位或职务')
thread_people_mobile = db.Column(db.String(30), comment='线索提供人联系方式') thread_people_mobile = db.Column(db.String(30), comment='线索提供人联系方式')
thread_progress = db.Column(db.String(30), comment='线索进展') thread_progress = db.Column(db.String(30), comment='线索（项目）进展')
# 线索详情 # 线索详情
upload_unity = db.Column(db.String(20), comment='上传部门') upload_unity = db.Column(db.String(20), comment='上传部门')
......
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