From d476e7d1595e131f2bb7bb1a62c00fa3e82fb0a7 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 19 十月 2026 17:23:30 +0800
Subject: [PATCH] feat: 添加员工工资明细中的请假、缺勤、迟到、早退次数及手动扣工资字段
---
src/main/resources/mapper/account/AccountStatementMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/account/AccountStatementMapper.xml b/src/main/resources/mapper/account/AccountStatementMapper.xml
index a4e00a8..9f99288 100644
--- a/src/main/resources/mapper/account/AccountStatementMapper.xml
+++ b/src/main/resources/mapper/account/AccountStatementMapper.xml
@@ -122,12 +122,12 @@
-- 杩涢」绋庢槑缁嗭紙閲囪喘璁㈠崟锛�
SELECT
pl.purchase_contract_number AS invoiceNo,
- pl.sales_contract_no AS salesContractNo,
+ pl.purchase_contract_number AS salesContractNo,
NULL AS supplierName,
- pl.supplier_name AS customerName,
+ pl.supplier_name AS customerName,
'杩涢」' AS orderType,
pl.entry_date AS invoiceDate,
- slp.tax_rate AS taxRate,
+ MAX(slp.tax_rate) AS taxRate,
ROUND(SUM(slp.tax_inclusive_total_price - slp.tax_exclusive_total_price), 2) AS jTaxAmount,
0 AS xTaxAmount,
ROUND(SUM(slp.tax_inclusive_total_price - slp.tax_exclusive_total_price), 2) AS taxAmount
@@ -148,7 +148,7 @@
sl.customer_name AS customerName,
'閿�椤�' AS orderType,
sl.entry_date AS invoiceDate,
- slp.tax_rate AS taxRate,
+ MAX(slp.tax_rate) AS taxRate,
0 AS jTaxAmount,
ROUND(SUM(slp.tax_inclusive_total_price - slp.tax_exclusive_total_price), 2) AS xTaxAmount,
ROUND(SUM(slp.tax_inclusive_total_price - slp.tax_exclusive_total_price), 2) AS taxAmount
--
Gitblit v1.9.3