From 515059db9f17ad4f2cfaa6970209a654f761112e Mon Sep 17 00:00:00 2001 From: yumoqing Date: Fri, 17 Jul 2026 15:20:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(accounting):=20human-readable=20summary=20?= =?UTF-8?q?=E2=80=94=20subject=5Fname=20#short=5Fid=20instead=20of=20raw?= =?UTF-8?q?=20UUIDs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wwwroot/billing.dspy | 3 ++- wwwroot/billing_download.dspy | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wwwroot/billing.dspy b/wwwroot/billing.dspy index 471d5b4..884dd1e 100644 --- a/wwwroot/billing.dspy +++ b/wwwroot/billing.dspy @@ -18,7 +18,8 @@ ns = { } async with get_sor_context(request._run_ns, 'accounting') as sor: - sql = """select d.acc_date, d.acc_timestamp, d.acc_dir, d.summary, + sql = """select d.acc_date, d.acc_timestamp, d.acc_dir, +concat(coalesce(s.name, '交易'), ' #', substring_index(d.summary, ':', 1)) as summary, d.amount, d.balance, s.name as subject_name, count(*) over() as _total, coalesce(sum(case when d.acc_dir = '1' then d.amount else 0 end) over(), 0) as _debit, diff --git a/wwwroot/billing_download.dspy b/wwwroot/billing_download.dspy index 38e3fc2..0f22977 100644 --- a/wwwroot/billing_download.dspy +++ b/wwwroot/billing_download.dspy @@ -19,8 +19,9 @@ ns = { } async with get_sor_context(request._run_ns, 'accounting') as sor: - sql = """select d.acc_date, d.acc_timestamp, s.name as subject_name, d.acc_dir, -d.summary, d.amount, d.balance + sql = """select d.acc_date, d.acc_timestamp, +concat(coalesce(s.name, '交易'), ' #', substring_index(d.summary, ':', 1)) as summary, +s.name as subject_name, d.acc_dir, d.amount, d.balance from acc_detail d join account a on d.accountid = a.id COLLATE utf8mb4_unicode_ci left join subject s on a.subjectid = s.id COLLATE utf8mb4_unicode_ci