From cccafbe651e93efbc0dbe6b1eba22629e09719b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Wed, 16 Sep 2026 09:43:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=B9=E5=85=AC=E6=B6=89=E5=86=9C?= =?UTF-8?q?=E4=BB=85=E4=BF=9D=E7=95=99=E5=88=A4=E5=AE=9A=E4=B8=BA=E5=86=9C?= =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95=EF=BC=8C=E4=B8=94=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=82=AE=E4=BB=B6=E5=9D=87?= =?UTF-8?q?=E6=8A=84=E9=80=81=E8=87=B3daijinshui@fangjia.com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/api/dag_njcb_village_statement.py | 17 ++++++++++++----- dags/poi/dag_check_gov_township_diff.py | 6 ++++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dags/api/dag_njcb_village_statement.py b/dags/api/dag_njcb_village_statement.py index 26e2614..c2ce33c 100644 --- a/dags/api/dag_njcb_village_statement.py +++ b/dags/api/dag_njcb_village_statement.py @@ -113,6 +113,11 @@ def export_and_send_njcb_statement(**context): if req_type != '2': continue + # 仅输出"输出-是否涉农"为"农"的部分 + verify_flag = str(result_map.get('verifyFlag', '')).strip() + if verify_flag != '农': + continue + c_date = doc.get('c_date') if isinstance(c_date, datetime.datetime): c_date_str = c_date.strftime('%Y-%m-%d %H:%M:%S') @@ -133,7 +138,7 @@ def export_and_send_njcb_statement(**context): '输出-区域编码': result_map.get('districtCode', ''), '输出-乡镇街道': result_map.get('town', ''), '输出-乡镇街道编码': result_map.get('townCode', ''), - '输出-是否涉农': result_map.get('verifyFlag', ''), + '输出-是否涉农': verify_flag, '输出-所属区域': result_map.get('addrArea', ''), '输出-地址验证': result_map.get('addrVerify', ''), '输出-是否为县级市': result_map.get('countyLevelCity', ''), @@ -145,7 +150,7 @@ def export_and_send_njcb_statement(**context): rows.append(row) total_count = len(rows) - print(f"扫描命中记录: {scanned_count} 条,其中符合对公涉农(type=2)记录: {total_count} 条") + print(f"扫描命中记录: {scanned_count} 条,其中符合对公且是否涉农为'农'的记录: {total_count} 条") # 生成 Excel 文件 tmp_dir = os.path.join(os.path.expanduser('~'), 'tmp', 'njcb_statement') @@ -163,6 +168,7 @@ def export_and_send_njcb_statement(**context): # 发送邮件 receiver = 'wangwenyan@fangjia.com' + cc_receiver = 'daijinshui@fangjia.com' subject = f"南京银行{last_year}年{last_month:02d}月涉农API对公涉农调用流水" html_content = f"""

顾老师:

@@ -170,17 +176,18 @@ def export_and_send_njcb_statement(**context):

附件为南京银行 {last_year}年{last_month:02d}月 涉农识别API(/addrSvc/njcbVillageIdentify)对公涉农调用流水,请查收。

如有任何疑问,请随时与我们联系。

""" - print(f"正在发送邮件至: {receiver}, 附件: {excel_path}") + print(f"正在发送邮件至: {receiver}, 抄送: {cc_receiver}, 附件: {excel_path}") send_email( to=receiver, subject=subject, html_content=html_content, - files=[excel_path] + files=[excel_path], + cc=cc_receiver ) print("邮件发送完成。") diff --git a/dags/poi/dag_check_gov_township_diff.py b/dags/poi/dag_check_gov_township_diff.py index e7bf48b..32908ce 100644 --- a/dags/poi/dag_check_gov_township_diff.py +++ b/dags/poi/dag_check_gov_township_diff.py @@ -189,6 +189,7 @@ def check_gov_township_diff(**context): # 发送邮件 receiver = "wangwenyan@fangjia.com" + cc_receiver = "daijinshui@fangjia.com" subject = f"【人工审核】县政府所在乡镇街道差异排查报告 - {datetime.now().strftime('%Y-%m-%d')}" html_content = f"""

王老师:

@@ -201,12 +202,13 @@ def check_gov_township_diff(**context):

详细差异名单已附在附件 Excel 中,请人工审核确认。

""" - print(f"正在发送审核邮件至: {receiver} ...") + print(f"正在发送审核邮件至: {receiver}, 抄送: {cc_receiver} ...") send_email( to=receiver, subject=subject, html_content=html_content, - files=[excel_path] + files=[excel_path], + cc=cc_receiver ) print("邮件发送完成!")