From 8b8ca4fb9791a5b79107e354cde500ed6f278219 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期日, 08 十月 2023 18:27:53 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index 1447548..d1e0bde 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -58,6 +58,8 @@
<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"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
@@ -113,7 +115,9 @@
subjecttype,
subjecttypename,
AnnexFiles,
- tax_time
+ tax_time,
+ jxrq,
+ ItemDescribe
from service_funddetail
</sql>
@@ -254,14 +258,15 @@
where fundID = #{fundid}
</update>
- <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO" resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
+ <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
+ resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
SELECT sum(Amount) amounts, sum(TaxAmount) taxAmounts, sum(TaxedAmount) taxedAmounts
FROM service_funddetail
where fundID < #{fundID}
and tax_time < #{taxTime}
and tax_time >= #{firstDay}
- and ApplyType = #{applyType}
- and BeneficiaryNo = #{beneficiaryNo}
+ and IDCardNo = #{IDCard}
+ and ApplyType in (1, 2)
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3