From c76f64a1f4d9a7f7283373be70b1dfd925286e4d Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 13 十月 2026 17:11:51 +0800
Subject: [PATCH] 上传命名规则调整

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml |   10 ++++++----
 1 files changed, 6 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..cb99db2 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"/>
@@ -83,6 +84,7 @@
                UnitName,
                UnitNo,
                UnitUserNo,
+               IsUnit,
                Title,
                OrderNo,
                ItemCode,
@@ -206,6 +208,7 @@
         a.UnitName,
         a.UnitNo,
         a.UnitUserNo,
+        a.IsUnit,
         a.Title,
         a.OrderNo,
         a.ItemCode,
@@ -278,22 +281,21 @@
 
     <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(a.TaxAmount) taxAmounts, sum(a.TaxedAmount) taxedAmounts, max(a.xh) as 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