From 38c0315830d9cac361551708a1ad643f72273990 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Wed, 7 Jan 2026 13:13:46 +0800 Subject: [PATCH 1/5] 1 --- yuthon_salary/wizard/party_meal_wizard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yuthon_salary/wizard/party_meal_wizard.py b/yuthon_salary/wizard/party_meal_wizard.py index d9560ad6d..8a571d8da 100644 --- a/yuthon_salary/wizard/party_meal_wizard.py +++ b/yuthon_salary/wizard/party_meal_wizard.py @@ -42,7 +42,8 @@ class PartyMealWizard(models.TransientModel): ('meal_state', '=', 'to_do') ]) for meal in meal_ids: - message = f"""致{meal.employee_id.name}：{self.select_year}年{self.select_time}月 早餐{meal.number_breakfasts} 次、午餐{meal.number_lunches} 次，按餐标核算，本月餐费合计{meal.total_payment}元。缴费截止{self.select_year}年{self.select_time}月{last_day}日]，可汇入账户:[账户信息]。异议请联系行政部 [联系方式]。 办公室{fields.Date.today()}""" + # message = f"致{meal.employee_id.name}：{self.select_year}年{self.select_time}月 早餐{meal.number_breakfasts} 次、午餐{meal.number_lunches} 次，按餐标核算，本月餐费合计{meal.total_payment}元。缴费截止{self.select_year}年{self.select_time}月{last_day}日]，可汇入账户:[账户信息]。异议请联系行政部 [联系方式]。 办公室{fields.Date.today()}""" + message = f"你好，{meal.employee_id.name}：{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{meal.fee}，补缴党费{meal.payment}，合计缴费{meal.total_payment}。请于15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att', user_id=meal.employee_id.wecom_userid, From 2fec3fe4cd1841a5a8d7731cecded1ed4322ce12 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Wed, 7 Jan 2026 13:28:28 +0800 Subject: [PATCH 2/5] 1 --- yuthon_salary/wizard/party_meal_wizard.py | 15 ++++++++------- yuthon_salary/wizard/party_send_wizard.py | 9 +++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/yuthon_salary/wizard/party_meal_wizard.py b/yuthon_salary/wizard/party_meal_wizard.py index 8a571d8da..cb82304cd 100644 --- a/yuthon_salary/wizard/party_meal_wizard.py +++ b/yuthon_salary/wizard/party_meal_wizard.py @@ -42,8 +42,8 @@ class PartyMealWizard(models.TransientModel): ('meal_state', '=', 'to_do') ]) for meal in meal_ids: - # message = f"致{meal.employee_id.name}：{self.select_year}年{self.select_time}月 早餐{meal.number_breakfasts} 次、午餐{meal.number_lunches} 次，按餐标核算，本月餐费合计{meal.total_payment}元。缴费截止{self.select_year}年{self.select_time}月{last_day}日]，可汇入账户:[账户信息]。异议请联系行政部 [联系方式]。 办公室{fields.Date.today()}""" - message = f"你好，{meal.employee_id.name}：{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{meal.fee}，补缴党费{meal.payment}，合计缴费{meal.total_payment}。请于15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" + message = f"致{meal.employee_id.name}：{self.select_year}年{self.select_time}月 早餐{meal.number_breakfasts} 次、午餐{meal.number_lunches} 次，按餐标核算，本月餐费合计{meal.total_payment}元。缴费截止{self.select_year}年{self.select_time}月{last_day}日]，可汇入账户:[账户信息]。异议请联系行政部 [联系方式]。 办公室{fields.Date.today()}""" + # message = f"你好，{meal.employee_id.name}：{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{meal.fee}，补缴党费{meal.payment}，合计缴费{meal.total_payment}。请于15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att', user_id=meal.employee_id.wecom_userid, @@ -56,11 +56,12 @@ class PartyMealWizard(models.TransientModel): meal = self.env['yuthon.meal.expenses'].search([('employee_id', '=', employee.id), ('select_time', '=', self.select_time), ('select_year', '=', self.select_year)]) - message = f"""致{meal.employee_id.name}： - {self.select_year}年{self.select_time}月 早餐{meal.number_breakfasts} 次、午餐{meal.number_lunches} 次，按餐标核算， - 本月餐费合计{meal.total_payment}元。缴费截止{self.select_year}年{self.select_time}月{last_day}日]，可汇入账户:[账户信息]。异议请联系行政部 [联系方式]。 - 办公室 - {fields.Date.today()}""" + # message = f"""致{meal.employee_id.name}： + # {self.select_year}年{self.select_time}月 早餐{meal.number_breakfasts} 次、午餐{meal.number_lunches} 次，按餐标核算， + # 本月餐费合计{meal.total_payment}元。缴费截止{self.select_year}年{self.select_time}月{last_day}日]，可汇入账户:[账户信息]。异议请联系行政部 [联系方式]。 + # 办公室 + # {fields.Date.today()}""" + message = f"你好，{meal.employee_id.name}：{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{meal.fee}，补缴党费{meal.payment}，合计缴费{meal.total_payment}。请于15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att', user_id=employee.wecom_userid, diff --git a/yuthon_salary/wizard/party_send_wizard.py b/yuthon_salary/wizard/party_send_wizard.py index 74b539961..04b5f8b1d 100644 --- a/yuthon_salary/wizard/party_send_wizard.py +++ b/yuthon_salary/wizard/party_send_wizard.py @@ -54,10 +54,11 @@ class PartySendWizard(models.TransientModel): party = self.env['yuthon.salary.party'].search([('employee_id', '=', employee.id), ('select_time', '=', self.select_time), ('select_year', '=', self.select_year)]) - message = f"""【{pay_year_month}缴纳党费通知】： - 请于{fields.Date.today()}（今天）15：00前将党费按时汇入账户:44001580909059000222 广州市天河投资集团有限公司, - 并在群里告知汇款完毕。 - 您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。""" + # message = f"""【{pay_year_month}缴纳党费通知】： + # 请于{fields.Date.today()}（今天）15：00前将党费按时汇入账户:44001580909059000222 广州市天河投资集团有限公司, + # 并在群里告知汇款完毕。 + # 您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。""" + message = f"你好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{party.fee}，补缴党费{party.payment}，合计缴费{party.total_payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att', user_id=employee.wecom_userid, From c85e5318c094bd12e583c1596c471be57385996c Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Wed, 7 Jan 2026 13:31:05 +0800 Subject: [PATCH 3/5] 1 --- yuthon_salary/wizard/party_send_wizard.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yuthon_salary/wizard/party_send_wizard.py b/yuthon_salary/wizard/party_send_wizard.py index 04b5f8b1d..74757f74d 100644 --- a/yuthon_salary/wizard/party_send_wizard.py +++ b/yuthon_salary/wizard/party_send_wizard.py @@ -39,9 +39,10 @@ class PartySendWizard(models.TransientModel): ('party_state', '=', 'to_do') ]) for party in party_ids: - message = f""" - {pay_year_month}2026年1月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。 - """ + # message = f""" + # {pay_year_month}2026年1月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。 + # """ + message = f"你好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{party.fee}，补缴党费{party.payment}，合计缴费{party.total_payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att', user_id=party.employee_id.wecom_userid, From d36cd6eb91fb54957fcc5c61a4bbf917fe148b13 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Wed, 7 Jan 2026 13:37:35 +0800 Subject: [PATCH 4/5] 1 --- yuthon_salary/wizard/party_send_wizard.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yuthon_salary/wizard/party_send_wizard.py b/yuthon_salary/wizard/party_send_wizard.py index 74757f74d..5da3cd9ef 100644 --- a/yuthon_salary/wizard/party_send_wizard.py +++ b/yuthon_salary/wizard/party_send_wizard.py @@ -42,7 +42,7 @@ class PartySendWizard(models.TransientModel): # message = f""" # {pay_year_month}2026年1月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。 # """ - message = f"你好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{party.fee}，补缴党费{party.payment}，合计缴费{party.total_payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" + message = f"您好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att', user_id=party.employee_id.wecom_userid, @@ -59,7 +59,8 @@ class PartySendWizard(models.TransientModel): # 请于{fields.Date.today()}（今天）15：00前将党费按时汇入账户:44001580909059000222 广州市天河投资集团有限公司, # 并在群里告知汇款完毕。 # 您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。""" - message = f"你好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{party.fee}，补缴党费{party.payment}，合计缴费{party.total_payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" + message = f"您好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" + # message = f"你好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{party.fee}，补缴党费{party.payment}，合计缴费{party.total_payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att', user_id=employee.wecom_userid, From 7e7139ca7c9f4ab9671be4e5e8552ad35bd8ef57 Mon Sep 17 00:00:00 2001 From: pengyuthon Date: Wed, 7 Jan 2026 13:39:04 +0800 Subject: [PATCH 5/5] 1 --- yuthon_salary/wizard/party_send_wizard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yuthon_salary/wizard/party_send_wizard.py b/yuthon_salary/wizard/party_send_wizard.py index 5da3cd9ef..f5347098a 100644 --- a/yuthon_salary/wizard/party_send_wizard.py +++ b/yuthon_salary/wizard/party_send_wizard.py @@ -42,7 +42,7 @@ class PartySendWizard(models.TransientModel): # message = f""" # {pay_year_month}2026年1月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。 # """ - message = f"您好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" + message = f"您好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于{fields.Date.today()}（今天）15：00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att', user_id=party.employee_id.wecom_userid, @@ -59,7 +59,7 @@ class PartySendWizard(models.TransientModel): # 请于{fields.Date.today()}（今天）15：00前将党费按时汇入账户:44001580909059000222 广州市天河投资集团有限公司, # 并在群里告知汇款完毕。 # 您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。""" - message = f"您好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" + message = f"您好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。请于{fields.Date.today()}（今天）15：00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" # message = f"你好，{party.employee_id.name}，{self.select_year}年{self.select_time}月缴纳党费通知：您当月的缴费金额为100，其中党费{party.fee}，补缴党费{party.payment}，合计缴费{party.total_payment}。请于今天15:00前，将党费按时汇入账户：44001580909059000222 广州市天河投资集团有限公司， 并在群里告知汇款完毕。" self.sudo().env["wecom.apps"].sync_send_message( category='att',