From 55aac55195dc2bd404042ec099045fee8ac73e81 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 02 七月 2025 21:48:53 +0800
Subject: [PATCH] 代码提交

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 0e5811e..263f923 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -65,12 +65,14 @@
         <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
         <result property="xh" column="xh"/>
+        <result property="allAmount" column="all_amount"/>
     </resultMap>
 
     <sql id="selectServiceFunddetailVo">
         select ID,
                fundID,
                xh,
+               all_amount,
                InfoId,
                DonorNo,
                dept_id,
@@ -150,6 +152,7 @@
             <if test="fundid != null and fundid != '' ">and fundID = #{fundid}</if>
             <if test="deptId != null  ">and dept_id = #{deptId}</if>
             <if test="deptName != null and deptName != '' ">and dept_name = #{deptName}</if>
+            <if test="allAmount != null ">and all_amount = #{allAmount}</if>
 
         </where>
     </select>
@@ -245,6 +248,7 @@
         a.subjecttype,
         a.dept_id,
         a.dept_name,
+        a.all_amount,
         a.subjecttypename
         from service_funddetail a,
         service_fund b
@@ -274,22 +278,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}
+            &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"
@@ -312,9 +315,9 @@
         and del_flag=0
     </select>
 
-    <select id="getListBySpStatBonus" statementType="CALLABLE"
-            resultType="com.ruoyi.project.domain.SpStatBonus">
-        call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR})
-    </select>
+    <!--    <select id="getListBySpStatBonus" statementType="CALLABLE"-->
+    <!--            resultType="com.ruoyi.project.domain.SpStatBonus">-->
+    <!--        call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR})-->
+    <!--    </select>-->
 
 </mapper>

--
Gitblit v1.9.3