From b9cc263b8d1d31608a4c16cd157cc84b51e3d29d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 02 八月 2024 18:11:24 +0800
Subject: [PATCH] 变更
---
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 111 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 93 insertions(+), 18 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index a07dad8..0e5811e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -7,6 +7,14 @@
<resultMap type="com.ruoyi.project.domain.ServiceFunddetail" id="ServiceFunddetailResult">
<result property="id" column="ID"/>
<result property="fundid" column="fundID"/>
+ <result property="orderno" column="OrderNo"/>
+ <result property="itemid" column="ItemID"/>
+ <result property="itemcode" column="ItemCode"/>
+ <result property="itemname" column="ItemName"/>
+ <result property="itemdescribe" column="ItemDescribe"/>
+ <result property="itemtype" column="ItemType"/>
+ <result property="applytype" column="ApplyType"/>
+ <result property="applytypename" column="ApplyTypeName"/>
<result property="beneficiaryname" column="BeneficiaryName"/>
<result property="beneficiaryno" column="BeneficiaryNo"/>
<result property="unitname" column="UnitName"/>
@@ -23,21 +31,19 @@
<result property="branchbankname" column="BranchBankName"/>
<result property="annexbankcard" column="AnnexBankCard"/>
<result property="annexregistform" column="AnnexRegistForm"/>
- <result property="applytype" column="ApplyType"/>
- <result property="applytypename" column="ApplyTypeName"/>
- <result property="itemid" column="ItemID"/>
- <result property="itemname" column="ItemName"/>
- <result property="itemtype" column="ItemType"/>
+ <result property="quantity" column="Quantity"/>
+ <result property="price" column="Price"/>
<result property="amount" column="Amount"/>
- <result property="prepaidamount" column="PrepaidAmount"/>
<result property="taxamount" column="TaxAmount"/>
- <result property="invoicecount" column="InvoiceCount"/>
<result property="taxedamount" column="TaxedAmount"/>
+ <result property="prepaidamount" column="PrepaidAmount"/>
+ <result property="invoicecount" column="InvoiceCount"/>
<result property="attachcount" column="AttachCount"/>
<result property="remark" column="Remark"/>
+ <result property="infoid" column="InfoId"/>
+ <result property="donorno" column="DonorNo"/>
+ <result property="donorname" column="DonorName"/>
<result property="recordstatus" column="RecordStatus"/>
- <result property="price" column="Price"/>
- <result property="quantity" column="Quantity"/>
<result property="del_flag" column="del_flag"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
@@ -45,24 +51,30 @@
<result property="updateTime" column="update_time"/>
<result property="uploadflag" column="uploadflag"/>
<result property="uploadtime" column="uploadtime"/>
- <result property="infoid" column="InfoId"/>
- <result property="donorno" column="DonorNo"/>
- <result property="donorname" column="DonorName"/>
<result property="servicesscope" column="SERVICESSCOPE"/>
<result property="servicesscopename" column="SERVICESSCOPENAME"/>
<result property="servicetype" column="SERVICETYPE"/>
<result property="servicetypename" column="SERVICETYPENAME"/>
- <result property="orderno" column="OrderNo"/>
- <result property="itemcode" column="ItemCode"/>
+ <result property="reimbursementamount" column="REIMBURSEMENTAMOUNT"/>
<result property="subjecttype" column="subjecttype"/>
<result property="subjecttypename" column="subjecttypename"/>
+ <result property="annexfiles" column="AnnexFiles"/>
+ <result property="taxTime" column="tax_time"/>
+ <result property="jxrq" column="jxrq"/>
+ <result property="invoicefiles" column="InvoiceFiles"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="deptName" column="dept_name"/>
+ <result property="xh" column="xh"/>
</resultMap>
<sql id="selectServiceFunddetailVo">
select ID,
fundID,
+ xh,
InfoId,
DonorNo,
+ dept_id,
+ dept_name,
DonorName,
BeneficiaryName,
BeneficiaryNo,
@@ -109,7 +121,12 @@
SERVICETYPE,
SERVICETYPENAME,
subjecttype,
- subjecttypename
+ subjecttypename,
+ AnnexFiles,
+ InvoiceFiles,
+ tax_time,
+ jxrq,
+ ItemDescribe
from service_funddetail
</sql>
@@ -131,6 +148,8 @@
<if test="uploadflag != null and uploadflag != ''">and uploadflag = #{uploadflag}</if>
<if test="uploadtime != null ">and uploadtime = #{uploadtime}</if>
<if test="fundid != null and fundid != '' ">and fundID = #{fundid}</if>
+ <if test="deptId != null ">and dept_id = #{deptId}</if>
+ <if test="deptName != null and deptName != '' ">and dept_name = #{deptName}</if>
</where>
</select>
@@ -224,12 +243,14 @@
a.SERVICETYPE,
a.SERVICETYPENAME,
a.subjecttype,
+ a.dept_id,
+ a.dept_name,
a.subjecttypename
from service_funddetail a,
service_fund b
where a.del_flag = '0'
and a.fundID = b.id
- <if test="beneficiaryNo != null and beneficiaryNo != '' ">and a.beneficiaryNo = #{beneficiaryNo}</if>
+ <if test="idcardno != null and idcardno != '' ">and a.IDCardNo = #{idcardno}</if>
and b.create_time >= #{starttime}
and b.create_time <= #{endtime}
@@ -238,8 +259,62 @@
<select id="getTaxBeforeByBeneFiciaryNo" parameterType="com.ruoyi.project.domain.vo.TaxMoneyVO"
resultMap="ServiceFunddetailResult">
<include refid="selectServiceFunddetailVo"/>
- where create_time like concat(#{startTime}, '%') and beneficiaryNo=#{beneficiaryNo}
+ where create_time like concat(#{startTime}, '%') and IDCardNo=#{idcardno}
</select>
-</mapper>
\ No newline at end of file
+ <update id="updateTaxTime" parameterType="com.ruoyi.project.domain.ServiceFunddetail">
+ update service_funddetail
+ <set>
+ tax_time = #{taxTime},
+ xh = #{xh}
+ </set>
+ where fundID = #{fundid}
+ </update>
+
+ <select id="getTaxSum" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
+ resultType="com.ruoyi.project.domain.vo.TaxMoneySumEO">
+ SELECT sum(a.Amount) amounts, sum(a.TaxAmount) taxAmounts, sum(a.TaxedAmount) taxedAmounts
+ FROM service_funddetail a,
+ service_fund b
+ where a.FundID = b.id
+ and a.tax_time <= #{taxTime}
+ and a.xh < #{xh}
+ and a.tax_time >= #{firstDay}
+ and TRIM(a.IDCardNo) = #{IDCard}
+ and a.del_flag != 1
+ and b.id != #{fundID}
+ and b.fundtaxtime
+ < #{taxTime}
+ and b.fundtaxtime >= #{firstDay}
+ and b.del_flag != 1
+ and b.ApplyType in (1
+ , 2)
+ </select>
+
+ <select id="getMaxXH" parameterType="com.ruoyi.project.domain.vo.TaxMoneyByItemEO"
+ resultType="Long">
+ SELECT max(xh)
+ FROM service_funddetail
+ where tax_time <= #{taxTime}
+ and tax_time >= #{firstDay}
+ and TRIM(IDCardNo) = #{IDCard}
+ and del_flag != 1
+ </select>
+
+ <select id="totlaTax" resultType="com.ruoyi.project.domain.ServiceFunddetail">
+ <include refid="selectServiceFunddetailVo"/>
+ where fundID in
+ <foreach item="item" index="index" collection="list"
+ open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ and del_flag=0
+ </select>
+
+ <select id="getListBySpStatBonus" statementType="CALLABLE"
+ resultType="com.ruoyi.project.domain.SpStatBonus">
+ call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNO,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR})
+ </select>
+
+</mapper>
--
Gitblit v1.9.3