fix(timezone): 审批单据时间统一为 naive 北京时间,消除 8 小时偏差
成因:approved_at / executed_at 列是 timestamp without time zone,而赋值用了
带时区的 datetime.now(timezone(timedelta(hours=8)))。psycopg2 对 naive 列不会
剥掉 tzinfo,而是转成 naive UTC 再写入,结果比同为北京时间的 created_at 早 8 小时。
(代码里并无 datetime.utcnow(),真实成因是 aware 值被驱动的隐式 UTC 转换。)
改动:
· outbound_service / borrow_service 的审批分支
datetime.now(beijing_tz).replace(tzinfo=None) → beijing_time()
(免审批分支已在上一轮改为 beijing_time,此处补齐审批分支);
· purchase_service 审批/完结分支同源缺陷一并修复;
· scrap_approval / scrap_approval_service 的 _beijing()、_beijing_now() 由
tz-aware 改为 naive —— 配合上述迁移把列类型改为 naive,
若仍返回 aware 值,timestamptz→timestamp 后会反向早 8 小时。
实测四表(scrap/outbound/borrow/purchase)created_at 与 approved_at 差值
均在同一秒内(-1ms ~ -12ms)。
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
from datetime import datetime
|
||||
import pytz
|
||||
from app.extensions import db
|
||||
from app.extensions import db, beijing_time
|
||||
from app.models.borrow import BorrowApproval
|
||||
from app.models.system import SysUser
|
||||
|
||||
@ -139,7 +139,8 @@ class BorrowApprovalService:
|
||||
)
|
||||
else:
|
||||
# 默认不审批:创建即已通过(status=1),直接进入“待库管执行”
|
||||
from datetime import datetime, timezone, timedelta
|
||||
# ★ approved_at 必须与 created_at(beijing_time) 同为 naive 本地时间:
|
||||
# approved_at 列是 timestamp without time zone,传 aware 时间会被驱动转成 UTC 存库,导致早 8 小时
|
||||
approval = BorrowApproval(
|
||||
request_no=request_no,
|
||||
applicant_id=applicant_id,
|
||||
@ -147,7 +148,7 @@ class BorrowApprovalService:
|
||||
borrower_name=borrower_name,
|
||||
status=1,
|
||||
actual_approver_id=applicant_id,
|
||||
approved_at=datetime.now(timezone(timedelta(hours=8))),
|
||||
approved_at=beijing_time(),
|
||||
)
|
||||
|
||||
approval.set_items(items)
|
||||
@ -388,8 +389,8 @@ class BorrowApprovalService:
|
||||
Returns:
|
||||
(success: bool, message: str, approval: BorrowApproval or None)
|
||||
"""
|
||||
beijing_tz = pytz.timezone('Asia/Shanghai')
|
||||
current_time = datetime.now(beijing_tz).replace(tzinfo=None)
|
||||
# ★ 统一取 naive 北京时间,与 created_at(beijing_time) 同口径
|
||||
current_time = beijing_time()
|
||||
|
||||
approval = BorrowApproval.query.get(request_id)
|
||||
if not approval:
|
||||
|
||||
Reference in New Issue
Block a user