From 2f13f59f023fba63aa993172d48c14bcaaafb233 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 16 五月 2024 13:53:34 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index 8ff32ae..81d136d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -65,6 +65,7 @@
         <result property="notes" column="notes"/>
         <result property="jxrq" column="jxrq"/>
         <result property="fundTaxId" column="fund_tax_id"/>
+        <result property="taxcost" column="TaxCost"/>
     </resultMap>
 
     <sql id="selectServiceFundVo">
@@ -127,6 +128,7 @@
                upload_states,
                jxrq,
                notes,
+               TaxCost,
                fund_tax_id
         from service_fund
     </sql>
@@ -151,6 +153,7 @@
         <if test="infoid != null ">and InfoID = #{infoid}</if>
         <if test="donorno != null   and donorno != '' ">and DonorNo = #{donorno}</if>
         <if test="jxrq != null ">and jxrq = #{jxrq}</if>
+        order by apply_time desc
     </select>
 
     <select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -268,6 +271,14 @@
 
     <select id="getExpertfeeList" statementType="CALLABLE"
             resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
-        call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PACHECKNO,mode=IN,jdbcType=VARCHAR},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{PADEPARTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
+        call SP_SELECT_EXPERTFEE(#{PAAPPLYTYPE,mode=IN,jdbcType=INTEGER},#{PFUNDTAXID,mode=IN,jdbcType=INTEGER},#{DONORNAME,mode=IN,jdbcType=VARCHAR},#{PADEPARTID,mode=IN,jdbcType=INTEGER},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
     </select>
-</mapper>
\ No newline at end of file
+
+    <update id="updateFundTaxIdById">
+        update service_fund
+        <set>
+            fund_tax_id = #{fundTaxId}
+        </set>
+        where id = #{id}
+    </update>
+</mapper>

--
Gitblit v1.9.3