From 596834ce4e233130d61888128fe66a0c008543dd Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 13 十月 2026 09:15:51 +0800
Subject: [PATCH] 修改了报销校验

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml |   55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 48 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..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"/>
@@ -62,19 +63,28 @@
         <result property="taxTime" column="tax_time"/>
         <result property="jxrq" column="jxrq"/>
         <result property="invoicefiles" column="InvoiceFiles"/>
+        <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,
+               dept_name,
                DonorName,
                BeneficiaryName,
                BeneficiaryNo,
                UnitName,
                UnitNo,
                UnitUserNo,
+               IsUnit,
                Title,
                OrderNo,
                ItemCode,
@@ -142,6 +152,9 @@
             <if test="uploadflag != null  and uploadflag != ''">and uploadflag = #{uploadflag}</if>
             <if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
             <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>
@@ -195,6 +208,7 @@
         a.UnitName,
         a.UnitNo,
         a.UnitUserNo,
+        a.IsUnit,
         a.Title,
         a.OrderNo,
         a.ItemCode,
@@ -235,6 +249,9 @@
         a.SERVICETYPE,
         a.SERVICETYPENAME,
         a.subjecttype,
+        a.dept_id,
+        a.dept_name,
+        a.all_amount,
         a.subjecttypename
         from service_funddetail a,
         service_fund b
@@ -254,22 +271,41 @@
     </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>
 
     <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
+        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 b.istax = 1
+          and a.tax_time >= #{firstDay}
+          and a.del_flag != 1
+          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"
+            resultType="Long">
+        SELECT max(xh)
         FROM service_funddetail
-        where fundID &lt; #{fundID}
-          and tax_time &lt; #{taxTime}
+        where tax_time &lt;= #{taxTime}
           and tax_time >= #{firstDay}
-          and IDCardNo = #{IDCard}
-          and ApplyType in (1, 2)
+          and TRIM(IDCardNo) = #{IDCard}
+          and del_flag != 1
     </select>
 
     <select id="totlaTax" resultType="com.ruoyi.project.domain.ServiceFunddetail">
@@ -282,4 +318,9 @@
         and del_flag=0
     </select>
 
-</mapper>
\ No newline at end of file
+    <!--    <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