From 054cfdd53b732d2f60627fc9ac7cf92233d3c200 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 17 十一月 2023 16:17:56 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index c7bbbb4..3ff8a43 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -263,13 +263,18 @@
 
     <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
             resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
-        SELECT sum(Amount) amounts, sum(TaxAmount) taxAmounts, sum(TaxedAmount) taxedAmounts
-        FROM service_funddetail
-        where fundID &lt; #{fundID}
-          and tax_time &lt; #{taxTime}
-          and tax_time >= #{firstDay}
-          and IDCardNo = #{IDCard}
-          and ApplyType in (1, 2)
+        SELECT sum(a.Amount) amounts, sum(a.TaxAmount) taxAmounts, sum(a.TaxedAmount) taxedAmounts
+        FROM service_funddetail a,service_fund b
+        where a.FundID = b.id
+          and a.tax_time &lt; #{taxTime}
+          and a.tax_time >= #{firstDay}
+          and 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)
     </select>
 
     <select id="totlaTax" resultType="com.ruoyi.project.domain.ServiceFunddetail">

--
Gitblit v1.9.3