From 087320d0a336f609b070213ff55ac006ca8776e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 7 Jan 2026 10:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_salary/wizard/party_meal_wizard.py | 11 +++++++----
 yuthon_salary/wizard/party_send_wizard.py |  7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/yuthon_salary/wizard/party_meal_wizard.py b/yuthon_salary/wizard/party_meal_wizard.py
index 1312eef81..4b3a8b9f2 100644
--- a/yuthon_salary/wizard/party_meal_wizard.py
+++ b/yuthon_salary/wizard/party_meal_wizard.py
@@ -38,12 +38,15 @@ class PartyMealWizard(models.TransientModel):
         last_day = calendar.monthrange(year, month)[1]
         if self.select_time and self.select_year and not self.employee_ids:
             meal_ids = self.env['yuthon.meal.expenses'].search([('select_time', '=', self.select_time),
-                                                                ('select_year', '=', self.select_year)])
+                                                                ('select_year', '=', self.select_year),
+                                                                ('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}日]，可汇入账户:[账户信息]。异议请联系行政部 [联系方式]。
-                                办公室
+                                {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()}"""
                 self.sudo().env["wecom.apps"].sync_send_message(
                     category='att',
diff --git a/yuthon_salary/wizard/party_send_wizard.py b/yuthon_salary/wizard/party_send_wizard.py
index 8cde0d597..4da2d22c9 100644
--- a/yuthon_salary/wizard/party_send_wizard.py
+++ b/yuthon_salary/wizard/party_send_wizard.py
@@ -35,10 +35,13 @@ class PartySendWizard(models.TransientModel):
         pay_year_month = self.select_year + '年' + self.select_time + '月'
         if self.select_time and self.select_year and not self.employee_ids:
             party_ids = self.env['yuthon.salary.party'].search([('select_time', '=', self.select_time),
-                                                                ('select_year', '=', self.select_year)])
+                                                                ('select_year', '=', self.select_year),
+                                                                ('party_state', '=', 'to_do')
+                                                                ])
             for party in party_ids:
                 message = f"""【{pay_year_month}缴纳党费通知】：
-                              请于{fields.Date.today()}（今天）15：00前将党费按时汇入账户:44001580909059000222 广州市天河投资集团有限公司, 
+                              请于{fields.Date.today()}（今天）15：00前将党费按时汇入账户:
+                              44001580909059000222 广州市天河投资集团有限公司, 
                               并在群里告知汇款完毕。
                               您当月的缴费金额为{party.total_payment}，其中党费{party.fee}，补缴党费{party.payment}。"""
                 self.sudo().env["wecom.apps"].sync_send_message(