From 2a00169095fb36b2a0a11a555891cb86630d9724 Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Wed, 20 May 2026 16:56:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=8F=96=E6=B6=88=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/compare_views.py | 7 ++++++- app/cross_compare_report.py | 28 ++++++++++++++++++++++++++-- app/tmnet_db_func.py | 8 +++++++- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/app/compare_views.py b/app/compare_views.py index 72821cd..272c9ac 100644 --- a/app/compare_views.py +++ b/app/compare_views.py @@ -71,4 +71,9 @@ def save_report_record_api(): @app.route('/api/query_report_records', methods=['GET']) def query_report_records_api(): - return query_collect_report_record(request.args) \ No newline at end of file + return query_collect_report_record(request.args) + + +@app.route('/api/del_report_record', methods=['GET']) +def del_report_record_api(): + return cancel_collect_report(request.args) \ No newline at end of file diff --git a/app/cross_compare_report.py b/app/cross_compare_report.py index 76aa21f..4bf8f64 100644 --- a/app/cross_compare_report.py +++ b/app/cross_compare_report.py @@ -565,8 +565,7 @@ def query_collect_report_record(params): if not str(area_id).lstrip('-').isdigit() or int(area_id) not in area_list: return json.dumps(make_common_res(5, '辖区id异常，请检查后重试')) report_type = check_param(params, 'report_type') - report_type = int(report_type) - if not report_type or report_type not in(0, 1, 2, 3): + if not report_type or int(report_type) not in (0, 1, 2, 3): # 0 对比报告 ，其余为预留 return json.dumps(make_common_res(7, '缺少报告类型，请刷新后重试')) report_type = int(report_type) @@ -576,3 +575,28 @@ def query_collect_report_record(params): res = make_common_res(0, 'ok') res['data'] = records return json.dumps(res, ensure_ascii=False) + + +def cancel_collect_report(params): + nodeid = check_param(params, 'nodeid') + if not nodeid: + return json.dumps(make_common_res(2, '缺少nodeid， 请刷新后重试')) + area_id = check_param(params, 'area_id') + if not area_id: + return json.dumps(make_common_res(3, '缺少area_id， 请刷新后重试')) + userid = check_param(params, 'userid') + if not userid: + return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试')) + area_list = db_user.query_areaid_list(userid) + if not area_list or len(area_list) < 1: + return json.dumps(make_common_res(5, '用户信息异常')) + area_list = map(int, area_list) + if not str(area_id).lstrip('-').isdigit() or int(area_id) not in area_list: + return json.dumps(make_common_res(5, '辖区id异常，请检查后重试')) + record_id = check_param(params, 'record_id') + if not record_id: + return json.dumps(make_common_res(6, '缺少记录id， 请刷新后重试')) + ret = db_tmnet.cancel_collect_report_sql(nodeid, area_id, record_id) + if not ret: + return json.dumps(make_common_res(7, '取消失败，请检查后重试')) + return json.dumps(make_common_res(0, 'ok')) diff --git a/app/tmnet_db_func.py b/app/tmnet_db_func.py index 2e79e00..39594f1 100644 --- a/app/tmnet_db_func.py +++ b/app/tmnet_db_func.py @@ -807,4 +807,10 @@ class TmnetDbHelper(TableDbHelperBase): sql = """ select * from cross_doctor_config.collect_report_record where nodeid = %s and area_id = %s and report_type = %s """ % (nodeid, area_id, report_type) - return self.do_select(sql) \ No newline at end of file + return self.do_select(sql) + + def cancel_collect_report_sql(self, nodeid, area_id, record_id): + sql = """ + delete from cross_doctor_config.collect_report_record where nodeid = %s and area_id = %s and id = %s + """ % (nodeid, area_id, record_id) + return self.do_execute(sql) \ No newline at end of file