From 89bb0237ead5fb632fcc14c2c52276496e19843f Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:35:49 +0800
Subject: [PATCH] 修改了增值税城建税
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index cb99db2..8070f25 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -37,6 +37,10 @@
<result property="amount" column="Amount"/>
<result property="taxamount" column="TaxAmount"/>
<result property="taxedamount" column="TaxedAmount"/>
+ <result property="vatAmount" column="vat_amount"/>
+ <result property="cityTaxAmount" column="city_tax_amount"/>
+ <result property="laborPretaxAmount" column="labor_pretax_amount"/>
+ <result property="taxVersion" column="tax_version"/>
<result property="prepaidamount" column="PrepaidAmount"/>
<result property="invoicecount" column="InvoiceCount"/>
<result property="attachcount" column="AttachCount"/>
@@ -108,6 +112,10 @@
TaxAmount,
InvoiceCount,
TaxedAmount,
+ vat_amount,
+ city_tax_amount,
+ labor_pretax_amount,
+ tax_version,
AttachCount,
Quantity,
Price,
@@ -232,6 +240,10 @@
a.TaxAmount,
a.InvoiceCount,
a.TaxedAmount,
+ a.vat_amount,
+ a.city_tax_amount,
+ a.labor_pretax_amount,
+ a.tax_version,
a.AttachCount,
a.Quantity,
a.Price,
@@ -281,7 +293,15 @@
<select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
- SELECT sum(a.Amount) amounts, sum(a.TaxAmount) taxAmounts, sum(a.TaxedAmount) taxedAmounts, max(a.xh) as xh,a.IDCardNo
+ SELECT sum(a.Amount) amounts,
+ sum(COALESCE(a.labor_pretax_amount, a.Amount)) laborPretaxAmounts,
+ sum(COALESCE(a.TaxAmount, 0)) taxAmounts,
+ sum(COALESCE(a.TaxedAmount, 0)) taxedAmounts,
+ sum(COALESCE(a.vat_amount, 0)) vatAmounts,
+ sum(COALESCE(a.city_tax_amount, 0)) cityTaxAmounts,
+ sum(CASE WHEN a.tax_version = 'v1' THEN 1 ELSE 0 END) v1Count,
+ max(a.xh) xh,
+ a.IDCardNo
FROM service_funddetail a,
service_fund b
where a.FundID = b.id
--
Gitblit v1.9.3