From ded03f0315e02c13f17b8bf7777c89a5cc73130e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 三月 2024 12:16:38 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index af294be..f59f571 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -56,7 +56,15 @@
<result property="riqi" column="riqi"/>
<result property="bh" column="bh"/>
<result property="checkstatus" column="checkstatus"/>
-
+ <result property="performancetype" column="performancetype"/>
+ <result property="istax" column="istax"/>
+ <result property="fundtaxtime" column="fundtaxtime"/>
+ <result property="applyTime" column="apply_time"/>
+ <result property="applyTime" column="apply_time"/>
+ <result property="uploadStates" column="upload_states"/>
+ <result property="notes" column="notes"/>
+ <result property="jxrq" column="jxrq"/>
+ <result property="fundTaxId" column="fund_tax_id"/>
</resultMap>
<sql id="selectServiceFundVo">
@@ -111,15 +119,25 @@
zffs,
riqi,
bh,
- checkstatus
+ checkstatus,
+ performancetype,
+ istax,
+ apply_time,
+ fundtaxtime,
+ upload_states,
+ jxrq,
+ notes,
+ fund_tax_id
from service_fund
</sql>
- <select id="selectServiceFundList" parameterType="com.ruoyi.project.domain.ServiceFund" resultMap="ServiceFundResult">
+ <select id="selectServiceFundList" parameterType="com.ruoyi.project.domain.ServiceFund"
+ resultMap="ServiceFundResult">
<include refid="selectServiceFundVo"/>
where del_flag = '0'
<if test="donorno != null and donorno != ''">and DonorNo = #{donorno}</if>
+ <if test="fundTaxId != null ">and fund_tax_id = #{fundTaxId}</if>
<if test="userno != null and userno != ''">and UserNo = #{userno}</if>
<if test="username != null and username != ''">and UserName like concat('%', #{username}, '%')</if>
<if test="applytype != null and applytype != ''">and ApplyType = #{applytype}</if>
@@ -132,6 +150,9 @@
<if test="createBy != null and createBy != '' ">and create_by = #{createBy}</if>
<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>
+ <if test="fundTaxId=-1 ">and fund_tax_id = null</if>
+ <if test="fundTaxId!= null and fundTaxId!= -1 ">and fund_tax_id = #{fundTaxId}</if>
</select>
<select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -190,6 +211,8 @@
`service_fund`.`uploadtime` AS `uploadtime`,
`service_fund`.`PretaxCost` AS `pretaxcost`,
`service_fund`.`TaxedCost` AS `taxedcost`,
+ `service_fund`.`jxrq` AS `jxrq`,
+ `service_fund`.`fund_tax_id` AS `fundTaxId`,
`service_funddetail`.`ID` AS `fdid`,
`service_funddetail`.`fundID` AS `fundid`,
`service_funddetail`.`BeneficiaryName` AS `beneficiaryname`,
@@ -242,8 +265,11 @@
<select id="getListBypower" statementType="CALLABLE"
resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
- call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER})
+ call SP_FINANCIAL_EXPENSES(#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PAFUNDTYPE,mode=IN,jdbcType=INTEGER},#{PAAPPLICANT,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONBEGTIME,mode=IN,jdbcType=VARCHAR},#{PAAPPLICATIONENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPARTMENT,mode=IN,jdbcType=VARCHAR},#{CHECKFLAG,mode=IN,jdbcType=INTEGER},#{APPLYTYPE,mode=IN,jdbcType=INTEGER},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{donorname,mode=IN,jdbcType=VARCHAR})
</select>
-
+ <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})
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3