From ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 10 十一月 2026 09:15:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 6c4e22f..8070f25 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -20,6 +20,7 @@
         <result property="unitname" column="UnitName"/>
         <result property="unitno" column="UnitNo"/>
         <result property="unituserno" column="UnitUserNo"/>
+        <result property="isunit" column="IsUnit"/>
         <result property="title" column="Title"/>
         <result property="idcardtype" column="IDCardType"/>
         <result property="idcardno" column="IDCardNo"/>
@@ -36,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"/>
@@ -83,6 +88,7 @@
                UnitName,
                UnitNo,
                UnitUserNo,
+               IsUnit,
                Title,
                OrderNo,
                ItemCode,
@@ -106,6 +112,10 @@
                TaxAmount,
                InvoiceCount,
                TaxedAmount,
+               vat_amount,
+               city_tax_amount,
+               labor_pretax_amount,
+               tax_version,
                AttachCount,
                Quantity,
                Price,
@@ -206,6 +216,7 @@
         a.UnitName,
         a.UnitNo,
         a.UnitUserNo,
+        a.IsUnit,
         a.Title,
         a.OrderNo,
         a.ItemCode,
@@ -229,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,
@@ -278,22 +293,29 @@
 
     <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
+        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
           and a.tax_time &lt;= #{taxTime}
-          and a.xh &lt; #{xh}
+          and b.istax = 1
           and a.tax_time >= #{firstDay}
-          and TRIM(a.IDCardNo) = #{IDCard}
           and a.del_flag != 1
-          and b.id != #{fundID}
           and b.fundtaxtime
             &lt;= #{taxTime}
           and b.fundtaxtime >= #{firstDay}
           and b.del_flag != 1
           and b.ApplyType in (1
             , 2)
+group by a.IDCardNo
     </select>
 
     <select id="getMaxXH" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"

--
Gitblit v1.9.3