From 32d4054619138c34062fb6bdcfed27caf5d0f97f Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 七月 2024 11:46:55 +0800
Subject: [PATCH] 变更

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 9f09a61..0e5811e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -64,11 +64,13 @@
         <result property="invoicefiles" column="InvoiceFiles"/>
         <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
+        <result property="xh" column="xh"/>
     </resultMap>
 
     <sql id="selectServiceFunddetailVo">
         select ID,
                fundID,
+               xh,
                InfoId,
                DonorNo,
                dept_id,
@@ -262,9 +264,10 @@
     </select>
 
     <update id="updateTaxTime" parameterType="com.ruoyi.project.domain.ServiceFunddetail">
-        update com.ruoyi.project.domain.
+        update service_funddetail
         <set>
             tax_time = #{taxTime},
+            xh = #{xh}
         </set>
         where fundID = #{fundid}
     </update>
@@ -275,7 +278,8 @@
         FROM service_funddetail a,
              service_fund b
         where a.FundID = b.id
-          and a.tax_time &lt; #{taxTime}
+          and a.tax_time &lt;= #{taxTime}
+          and a.xh &lt; #{xh}
           and a.tax_time >= #{firstDay}
           and TRIM(a.IDCardNo) = #{IDCard}
           and a.del_flag != 1
@@ -286,6 +290,16 @@
           and b.del_flag != 1
           and b.ApplyType in (1
             , 2)
+    </select>
+
+    <select id="getMaxXH" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
+            resultType="Long">
+        SELECT max(xh)
+        FROM service_funddetail
+        where tax_time &lt;= #{taxTime}
+          and tax_time >= #{firstDay}
+          and TRIM(IDCardNo) = #{IDCard}
+          and del_flag != 1
     </select>
 
     <select id="totlaTax" resultType="com.ruoyi.project.domain.ServiceFunddetail">
@@ -303,4 +317,4 @@
         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>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3