From 6f344e6360751574f7e03b21c00cfa3f4b2bc099 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 十一月 2023 15:41:41 +0800
Subject: [PATCH] 代码提交

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

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index d1e0bde..c7bbbb4 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -7,6 +7,14 @@
     <resultMap type="com.ruoyi.project.domain.ServiceFunddetail" id="ServiceFunddetailResult">
         <result property="id" column="ID"/>
         <result property="fundid" column="fundID"/>
+        <result property="orderno" column="OrderNo"/>
+        <result property="itemid" column="ItemID"/>
+        <result property="itemcode" column="ItemCode"/>
+        <result property="itemname" column="ItemName"/>
+        <result property="itemdescribe" column="ItemDescribe"/>
+        <result property="itemtype" column="ItemType"/>
+        <result property="applytype" column="ApplyType"/>
+        <result property="applytypename" column="ApplyTypeName"/>
         <result property="beneficiaryname" column="BeneficiaryName"/>
         <result property="beneficiaryno" column="BeneficiaryNo"/>
         <result property="unitname" column="UnitName"/>
@@ -23,21 +31,19 @@
         <result property="branchbankname" column="BranchBankName"/>
         <result property="annexbankcard" column="AnnexBankCard"/>
         <result property="annexregistform" column="AnnexRegistForm"/>
-        <result property="applytype" column="ApplyType"/>
-        <result property="applytypename" column="ApplyTypeName"/>
-        <result property="itemid" column="ItemID"/>
-        <result property="itemname" column="ItemName"/>
-        <result property="itemtype" column="ItemType"/>
+        <result property="quantity" column="Quantity"/>
+        <result property="price" column="Price"/>
         <result property="amount" column="Amount"/>
-        <result property="prepaidamount" column="PrepaidAmount"/>
         <result property="taxamount" column="TaxAmount"/>
-        <result property="invoicecount" column="InvoiceCount"/>
         <result property="taxedamount" column="TaxedAmount"/>
+        <result property="prepaidamount" column="PrepaidAmount"/>
+        <result property="invoicecount" column="InvoiceCount"/>
         <result property="attachcount" column="AttachCount"/>
         <result property="remark" column="Remark"/>
+        <result property="infoid" column="InfoId"/>
+        <result property="donorno" column="DonorNo"/>
+        <result property="donorname" column="DonorName"/>
         <result property="recordstatus" column="RecordStatus"/>
-        <result property="price" column="Price"/>
-        <result property="quantity" column="Quantity"/>
         <result property="del_flag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -45,21 +51,17 @@
         <result property="updateTime" column="update_time"/>
         <result property="uploadflag" column="uploadflag"/>
         <result property="uploadtime" column="uploadtime"/>
-        <result property="infoid" column="InfoId"/>
-        <result property="donorno" column="DonorNo"/>
-        <result property="donorname" column="DonorName"/>
         <result property="servicesscope" column="SERVICESSCOPE"/>
         <result property="servicesscopename" column="SERVICESSCOPENAME"/>
         <result property="servicetype" column="SERVICETYPE"/>
         <result property="servicetypename" column="SERVICETYPENAME"/>
-        <result property="orderno" column="OrderNo"/>
-        <result property="itemcode" column="ItemCode"/>
+        <result property="reimbursementamount" column="REIMBURSEMENTAMOUNT"/>
         <result property="subjecttype" column="subjecttype"/>
         <result property="subjecttypename" column="subjecttypename"/>
         <result property="annexfiles" column="AnnexFiles"/>
         <result property="taxTime" column="tax_time"/>
         <result property="jxrq" column="jxrq"/>
-        <result property="itemdescribe" column="ItemDescribe"/>
+        <result property="invoicefiles" column="InvoiceFiles"/>
     </resultMap>
 
     <sql id="selectServiceFunddetailVo">
@@ -115,6 +117,7 @@
                subjecttype,
                subjecttypename,
                AnnexFiles,
+               InvoiceFiles,
                tax_time,
                jxrq,
                ItemDescribe
@@ -237,7 +240,7 @@
         service_fund b
         where a.del_flag = '0'
         and a.fundID = b.id
-        <if test="beneficiaryNo != null  and beneficiaryNo != '' ">and a.beneficiaryNo = #{beneficiaryNo}</if>
+        <if test="idcardno != null  and idcardno != '' ">and a.IDCardNo = #{idcardno}</if>
         and b.create_time >= #{starttime}
         and b.create_time &lt;= #{endtime}
 
@@ -246,7 +249,7 @@
     <select id="getTaxBeforeByBeneFiciaryNo" parameterType="com.ruoyi.project.domain.vo.TaxMoneyVO"
             resultMap="ServiceFunddetailResult">
         <include refid="selectServiceFunddetailVo"/>
-        where create_time like concat(#{startTime}, '%') and beneficiaryNo=#{beneficiaryNo}
+        where create_time like concat(#{startTime}, '%') and IDCardNo=#{idcardno}
 
     </select>
 
@@ -269,4 +272,14 @@
           and ApplyType in (1, 2)
     </select>
 
+    <select id="totlaTax" resultType="com.ruoyi.project.domain.ServiceFunddetail">
+        <include refid="selectServiceFunddetailVo"/>
+        where fundID in
+        <foreach item="item" index="index" collection="list"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and del_flag=0
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3