From 4920ea5372b919f8b8f27cd709e1ab4040fe8d2b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 11 三月 2024 12:02:30 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml |   27 ++++++++++++++++++++-------
 1 files changed, 20 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..a2e4c8a 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -62,6 +62,8 @@
         <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"/>
     </resultMap>
 
     <sql id="selectServiceFunddetailVo">
@@ -69,6 +71,8 @@
                fundID,
                InfoId,
                DonorNo,
+               dept_id,
+               dept_name,
                DonorName,
                BeneficiaryName,
                BeneficiaryNo,
@@ -142,6 +146,8 @@
             <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>
 
         </where>
     </select>
@@ -235,6 +241,8 @@
         a.SERVICETYPE,
         a.SERVICETYPENAME,
         a.subjecttype,
+        a.dept_id,
+        a.dept_name,
         a.subjecttypename
         from service_funddetail a,
         service_fund b
@@ -263,13 +271,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 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)
     </select>
 
     <select id="totlaTax" resultType="com.ruoyi.project.domain.ServiceFunddetail">

--
Gitblit v1.9.3