diff --git a/app/task_worker.py b/app/task_worker.py index 464bd90..e49c88f 100644 --- a/app/task_worker.py +++ b/app/task_worker.py @@ -582,7 +582,7 @@ def do_add_task(params): elif task_type_class == 3: 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]) + userids = db_user.query_user_info_by_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: @@ -1828,7 +1828,8 @@ def update_greenwave_task_stage_info(params): return json.dumps(make_common_res(11, '缺少任务进度信息，请刷新后重试')) progress = int(progress) creator_name, executor_name = task_info['creatorid'], task_info['executor'] - userids = db_user.query_user_info_by_name([creator_name, executor_name]) + creator_id = db_user.query_user_info_by_name([creator_name]) + executor_id = db_user.query_user_info_by_name([executor_name]) if modify_stage == 1: wave_crosses = db_wave.query_wave_crosses(waveid) @@ -1840,7 +1841,7 @@ def update_greenwave_task_stage_info(params): return json.dumps(make_common_res(15, '当前绿波设置的运行时段与需求确认单中要求的协调时段不一致，请按需求确认单中要求调整')) ret = db_task.update_stage1_info(task_no, waveid, wave_name, stage_info, task_info, wave_crosses) if ret: - send_confirm_email(userids, f'当前任务到达绿波优化阶段, 请及时处理', task_no, task_info['task_name'], '绿波优化阶段', nodeid, area_id, creator_name, executor_name) + # send_confirm_email(userids, f'当前任务到达绿波优化阶段, 请及时处理', task_no, task_info['task_name'], '绿波优化阶段', nodeid, area_id, creator_name, executor_name) db_task.update_task_progress(task_no, nodeid, area_id, progress) return json.dumps(make_common_res(0, '更新成功')) else: @@ -1850,7 +1851,7 @@ def update_greenwave_task_stage_info(params): return json.dumps(make_common_res(12, '任务未上传绿波优化报告文件， 请先上传文件')) res = db_task.update_stage2_info(task_no, stage_info) if res: - send_confirm_email(userids, f'当前任务到达方案下发阶段, 请及时处理', task_no, task_info['task_name'], '方案下发阶段', nodeid, area_id, creator_name, executor_name) + send_confirm_email(creator_id, f'当前任务到达方案下发阶段, 请及时处理', task_no, task_info['task_name'], '方案下发阶段', nodeid, area_id, creator_name, executor_name) db_task.update_task_progress(task_no, nodeid, area_id, progress) return json.dumps(make_common_res(0, '更新成功')) else: @@ -1864,7 +1865,7 @@ def update_greenwave_task_stage_info(params): delay_reason = '' ret = db_task.update_stage3_info(actually_issue_time, task_no, stage_info, delay_reason) if ret: - send_confirm_email(userids, f'当前任务到达效果确认阶段, 请及时处理', task_no, task_info['task_name'], '效果确认阶段', nodeid, area_id, creator_name, executor_name) + send_confirm_email(creator_id + executor_id, f'当前任务到达效果确认阶段, 请及时处理', task_no, task_info['task_name'], '效果确认阶段', nodeid, area_id, creator_name, executor_name) db_task.update_task_progress(task_no, nodeid, area_id, progress) return json.dumps(make_common_res(0, '更新成功')) else: @@ -1876,9 +1877,9 @@ def update_greenwave_task_stage_info(params): ret, has_bad = db_task.update_stage4_info(task_no, stage_info, tp_info, nodeid, area_id, task_additional_info) if ret: if has_bad: - send_confirm_email(userids, f'当前任务到达方案微调阶段, 请及时处理', task_no, task_info['task_name'], '方案微调阶段', nodeid, area_id, creator_name, executor_name) + send_confirm_email(executor_id, f'当前任务到达方案微调阶段, 请及时处理', task_no, task_info['task_name'], '方案微调阶段', nodeid, area_id, creator_name, executor_name) else: - send_confirm_email(userids, f'当前任务到达对比报告阶段, 请及时处理', task_no, task_info['task_name'], '对比报告阶段', nodeid, area_id, creator_name, executor_name) + send_confirm_email(executor_id, f'当前任务到达对比报告阶段, 请及时处理', task_no, task_info['task_name'], '对比报告阶段', nodeid, area_id, creator_name, executor_name) db_task.update_task_progress(task_no, nodeid, area_id, progress) return json.dumps(make_common_res(0, '更新成功')) else: @@ -1889,7 +1890,7 @@ def update_greenwave_task_stage_info(params): return json.dumps(make_common_res(18, '缺少效果一致确认时间， 请刷新后重试')) ret = db_task.update_stage5_info(task_no, stage_info, affirm_time) if ret: - send_confirm_email(userids, f'当前任务到达对比报告阶段, 请及时处理', task_no, task_info['task_name'], '对比报告阶段', nodeid, area_id, creator_name, executor_name) + send_confirm_email(executor_id, f'当前任务到达对比报告阶段, 请及时处理', task_no, task_info['task_name'], '对比报告阶段', nodeid, area_id, creator_name, executor_name) db_task.update_task_progress(task_no, nodeid, area_id, progress) return json.dumps(make_common_res(0, '更新成功')) else: @@ -1900,7 +1901,7 @@ def update_greenwave_task_stage_info(params): # 阶段6与阶段2更新内容一致，均为阶段信息，因此此处共用同一个函数 ret = db_task.update_stage2_info(task_no, stage_info) if ret: - send_confirm_email(userids, f'当前任务到达更新台账阶段, 请及时处理', task_no, task_info['task_name'], '更新台账阶段', nodeid, area_id, creator_name, executor_name) + send_confirm_email(creator_id, f'当前任务到达更新台账阶段, 请及时处理', task_no, task_info['task_name'], '更新台账阶段', nodeid, area_id, creator_name, executor_name) db_task.update_task_progress(task_no, nodeid, area_id, progress) return json.dumps(make_common_res(0, '更新成功')) else: @@ -1932,7 +1933,7 @@ def update_greenwave_task_stage_info(params): logging.error(f'open_monitor_res: {open_monitor_res}') logging.error(f'update_task_additional_ret:{update_task_additional_ret}') if open_polling_res and open_monitor_res and update_task_additional_ret == 1: - send_confirm_email(userids, f'当前任务阶段已完成, 请及时更新任务状态', task_no, task_info['task_name'], '-', nodeid, area_id, creator_name, executor_name) + # send_confirm_email(userids, f'当前任务阶段已完成, 请及时更新任务状态', task_no, task_info['task_name'], '-', nodeid, area_id, creator_name, executor_name) db_task.update_task_progress(task_no, nodeid, area_id, progress) return json.dumps(make_common_res(0, '更新成功')) else: