xuwang
/
cross_doctor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复创建任务时当任务类型为组内完成时任务信息保存异常

This commit is contained in:
wangxu 2026-04-07 14:53:58 +08:00
parent c712061c95
commit 92cde299a8
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/task_db_func.py
View File

@ -531,6 +531,10 @@ class TaskDbHelper(TableDbHelperBase):
logging.error(e) logging.error(e)
return False return False
def init_additional_info(self, task_no, nodeid, area_id):
insert_additional_sql = "insert into task.greenwave_task_additional_detail (task_no, nodeid, area_id) values (%s, %s, %s)" % (task_no, nodeid, area_id)
return self.do_execute(insert_additional_sql)
def async_wave_tp_id(self, wave_tp_info, task_tp_info, task_no, nodeid, area_id): def async_wave_tp_id(self, wave_tp_info, task_tp_info, task_no, nodeid, area_id):
# 补充同步绿波时段id到任务时段信息表中的逻辑 # 补充同步绿波时段id到任务时段信息表中的逻辑
wave_tp_info_dict = {row['tp_start'] + '-' + row['tp_end'] + '-' + row['weekday']: row['wave_tp_id'] for row in wave_tp_info} wave_tp_info_dict = {row['tp_start'] + '-' + row['tp_end'] + '-' + row['weekday']: row['wave_tp_id'] for row in wave_tp_info}

15
app/task_worker.py
View File

@ -572,11 +572,6 @@ def do_add_task(params):
logging.error(e) logging.error(e)
return json.dumps(make_common_res(2, '台账任务创建成功，但路口列表配时方案状态更新失败，请反馈该情况至管理员！')) return json.dumps(make_common_res(2, '台账任务创建成功，但路口列表配时方案状态更新失败，请反馈该情况至管理员！'))
elif task_type_class == 3: elif task_type_class == 3:
if full_review != 1:
require_confirm_info = check_param(params, 'require_confirm_info')
if not require_confirm_info and full_review != 1:
return json.dumps(make_common_res(2, '缺少需求核验单信息，请检查后重试'))
require_confirm_info = json.loads(require_confirm_info)
creator_id = check_param(params, 'creator_id') creator_id = check_param(params, 'creator_id')
if not creator_id: if not creator_id:
return json.dumps(make_common_res(2, '需求核验单创建者信息缺失，请检查后重试')) return json.dumps(make_common_res(2, '需求核验单创建者信息缺失，请检查后重试'))
@ -584,11 +579,21 @@ def do_add_task(params):
creator_name, executor_name = task_info['creatorid'], task_info['executor'] creator_name, executor_name = task_info['creatorid'], task_info['executor']
userids = db_user.query_user_info_by_name([creator_name, executor_name]) userids = db_user.query_user_info_by_name([creator_name, executor_name])
if full_review != 1: if full_review != 1:
require_confirm_info = check_param(params, 'require_confirm_info')
if not require_confirm_info and full_review != 1:
return json.dumps(make_common_res(2, '缺少需求核验单信息，请检查后重试'))
require_confirm_info = json.loads(require_confirm_info)
save_require_confirm_ret = db_task.save_task_require_confirm_info(taskno, nodeid, area_id, require_confirm_info, creator_id, operator) save_require_confirm_ret = db_task.save_task_require_confirm_info(taskno, nodeid, area_id, require_confirm_info, creator_id, operator)
if not save_require_confirm_ret: if not save_require_confirm_ret:
logging.error(str(params) + ' do_add_task添加任务需求核验单信息失败!') logging.error(str(params) + ' do_add_task添加任务需求核验单信息失败!')
res = make_common_res(-1, '绿波优化任务创建成功，但需求确认单信息保存失败，请反馈该信息至管理员') res = make_common_res(-1, '绿波优化任务创建成功，但需求确认单信息保存失败，请反馈该信息至管理员')
return json.dumps(res) return json.dumps(res)
else:
init_ret = db_task.init_additional_info(taskno, nodeid, area_id)
if not init_ret:
logging.error(str(params) + ' do_add_task初始化任务信息失败!')
res = make_common_res(-1, '绿波优化任务创建成功，但初始化任务信息失败，请反馈该信息至管理员')
return json.dumps(res)
send_confirm_email(userids, f'当前任务创建成功，请及时开展绿波创建工作', taskno, task_info['task_name'], '绿波创建', nodeid, area_id, creator_name, executor_name) send_confirm_email(userids, f'当前任务创建成功，请及时开展绿波创建工作', taskno, task_info['task_name'], '绿波创建', nodeid, area_id, creator_name, executor_name)
res = make_common_res(0, 'ok') res = make_common_res(0, 'ok')