From 5b6bd2b10c8c87b658b888f4d0384aec3ed491ce Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 26 八月 2025 12:21:29 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 27 +++++++++++++++++++++++++-- 1 files changed, 25 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..4dcbf61 100644 --- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml +++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml @@ -65,12 +65,15 @@ <result property="notes" column="notes"/> <result property="jxrq" column="jxrq"/> <result property="fundTaxId" column="fund_tax_id"/> + <result property="taxcost" column="TaxCost"/> + <result property="summaryId" column="summary_id"/> </resultMap> <sql id="selectServiceFundVo"> select ID, InfoID, DonorNo, + summary_id, DonorName, del_flag, create_by, @@ -127,6 +130,7 @@ upload_states, jxrq, notes, + TaxCost, fund_tax_id from service_fund </sql> @@ -151,6 +155,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"> @@ -167,6 +172,7 @@ SELECT `service_fund`.`ID` AS `id`, `service_fund`.`InfoID` AS `infoid`, + `service_fund`.`summary_id` AS `summaryId`, `service_fund`.`DonorNo` AS `donorno`, `service_fund`.`DonorName` AS `donorname`, `service_fund`.`UserNo` AS `userno`, @@ -268,6 +274,23 @@ <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}, + fundtaxtime = null + </set> + where id = #{id} + </update> + <update id="updateFundIsTexById"> + update service_fund + <set> + istax = #{isTax}, + fundtaxtime = null + </set> + where id = #{id} + </update> +</mapper> -- Gitblit v1.9.3