From 92cde299a8b3550361707b0d4c3b8cfffa793ccf Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Tue, 7 Apr 2026 14:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=B6=E5=BD=93=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E7=BB=84=E5=86=85=E5=AE=8C=E6=88=90=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/task_db_func.py | 4 ++++ app/task_worker.py | 31 ++++++++++++++++++------------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/task_db_func.py b/app/task_db_func.py index 8a88e8d..7c74d59 100644 --- a/app/task_db_func.py +++ b/app/task_db_func.py @@ -531,6 +531,10 @@ class TaskDbHelper(TableDbHelperBase): logging.error(e) 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): # 补充同步绿波时段id到任务时段信息表中的逻辑 wave_tp_info_dict = {row['tp_start'] + '-' + row['tp_end'] + '-' + row['weekday']: row['wave_tp_id'] for row in wave_tp_info} diff --git a/app/task_worker.py b/app/task_worker.py index b25917e..c6f8119 100644 --- a/app/task_worker.py +++ b/app/task_worker.py @@ -572,24 +572,29 @@ def do_add_task(params): logging.error(e) return json.dumps(make_common_res(2, '台账任务创建成功，但路口列表配时方案状态更新失败，请反馈该情况至管理员！')) elif task_type_class == 3: + creator_id = check_param(params, 'creator_id') + if not creator_id: + return json.dumps(make_common_res(2, '需求核验单创建者信息缺失，请检查后重试')) + task_info = db_task.query_task(taskno, nodeid, area_id) + creator_name, executor_name = task_info['creatorid'], task_info['executor'] + userids = db_user.query_user_info_by_name([creator_name, executor_name]) 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') - if not creator_id: - return json.dumps(make_common_res(2, '需求核验单创建者信息缺失，请检查后重试')) - task_info = db_task.query_task(taskno, nodeid, area_id) - creator_name, executor_name = task_info['creatorid'], task_info['executor'] - userids = db_user.query_user_info_by_name([creator_name, executor_name]) - if full_review != 1: - 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: - 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) + 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: + logging.error(str(params) + ' do_add_task添加任务需求核验单信息失败!') + res = make_common_res(-1, '绿波优化任务创建成功，但需求确认单信息保存失败，请反馈该信息至管理员') + 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) res = make_common_res(0, 'ok') res['nodeid'] = nodeid