From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改
---
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index b99d1e7..edefa9f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -33,6 +33,7 @@
<result property="deptmentname" column="DeptmentName"/>
<result property="opochecker" column="OPOchecker"/>
<result property="finvicepresident" column="FinVicePresident"/>
+ <result property="financechecher" column="FinanceChecher"/>
<result property="president" column="president"/>
<result property="busvicepresident" column="BusVicePresident"/>
<result property="officedirector" column="OfficeDirector"/>
@@ -60,13 +61,20 @@
<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"/>
+ <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,
@@ -119,7 +127,12 @@
performancetype,
istax,
apply_time,
- fundtaxtime
+ fundtaxtime,
+ upload_states,
+ jxrq,
+ notes,
+ TaxCost,
+ fund_tax_id
from service_fund
</sql>
@@ -129,6 +142,7 @@
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>
@@ -141,6 +155,8 @@
<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>
+ order by apply_time desc
</select>
<select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
@@ -157,6 +173,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`,
@@ -199,6 +216,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`,
@@ -253,4 +272,26 @@
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},#{CHECKSTATUS,mode=IN,jdbcType=INTEGER},#{donorname,mode=IN,jdbcType=VARCHAR})
</select>
-</mapper>
\ No newline at end of file
+
+ <select id="getExpertfeeList" statementType="CALLABLE"
+ resultType="com.ruoyi.project.domain.vo.SpFinancialExpensesFundOut">
+ 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>
+
+ <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