fix: 增加周五证件到期微信汇总通知,保持说明与发送规则一致。
This commit is contained in:
1 parent
3aa0f0ff2e
commit
027d1751a3
5 files changed
+10
-10
No files matched your search
@@ -100,7 +100,7 @@ WECHAT_OA_TEMPLATE_PENDING=ukQRYoczEXH1fZe9TdL8uX6LmuJJTlPidboxqtq_7N0
|
||||
WECHAT_OA_TEMPLATE_RESULT=vA_z15BdP-8LltRmS__1MmUcNKQBy6b6rvAXKEYzoLY
|
||||
WECHAT_OA_TEMPLATE_COMPLETION=rnPOIVknPqfgwVzKbchj6pCMCWpoDe3h3dkrFbUEsD4
|
||||
WECHAT_OA_TEMPLATE_CERT_REMINDER=aYzLZ_EqI8hq7RXrlf73BTAfNvzgJHeg_xWKar01Md0
|
||||
# 每日扫描证件,仅周一、周三扫描后发送微信汇总;Asia/Shanghai,同时受总开关控制。
|
||||
# 每日扫描证件,仅周一、周三、周五扫描后发送微信汇总;Asia/Shanghai,同时受总开关控制。
|
||||
WECHAT_OA_CERT_REMINDER_ENABLED=true
|
||||
WECHAT_OA_CERT_NOTICE_ROLE_NAME=证件到期通知接收人
|
||||
WECHAT_OA_CERT_REMINDER_HOUR=10
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"""证件到期周一、周三汇总:扫描后入队,发送前复核真实证件与收件权限。"""
|
||||
"""证件到期周一、周三、周五汇总:扫描后入队,发送前复核真实证件与收件权限。"""
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import date, datetime
|
||||
@@ -51,8 +51,8 @@ def _recipients(db: Session):
|
||||
|
||||
|
||||
def _is_notice_time(now: datetime) -> bool:
|
||||
# 门户预警仍每日扫描,微信只在上海时间周一、周三10点(默认)之后发送。
|
||||
return now.weekday() in (0, 2) and (now.hour, now.minute) >= (
|
||||
# 门户预警仍每日扫描,微信只在上海时间周一、周三、周五10点(默认)之后发送。
|
||||
return now.weekday() in (0, 2, 4) and (now.hour, now.minute) >= (
|
||||
settings.WECHAT_OA_CERT_REMINDER_HOUR, settings.WECHAT_OA_CERT_REMINDER_MINUTE,
|
||||
)
|
||||
|
||||
|
||||
@@ -233,9 +233,9 @@ def test_scope_is_based_on_reminder_creator_as_in_list(cert_notices):
|
||||
|
||||
@pytest.mark.parametrize("day,hour,expected", [
|
||||
(26, 9, 0), (26, 10, 1), (27, 10, 0), (28, 10, 1),
|
||||
(29, 10, 0), (30, 10, 0), (31, 10, 0),
|
||||
(29, 10, 0), (30, 10, 1), (31, 10, 0),
|
||||
])
|
||||
def test_only_monday_wednesday_after_ten_enqueue(cert_notices, day, hour, expected):
|
||||
def test_only_monday_wednesday_friday_after_ten_enqueue(cert_notices, day, hour, expected):
|
||||
svc, db, _, add_cert, Notice = cert_notices
|
||||
add_cert()
|
||||
assert svc.enqueue_daily_cert_notices(db, now=datetime(2026, 10, day, hour)) == expected
|
||||
|
||||
Reference in new issue
Block a user