From 1ba00bbbd771572c06f774f48ec748434407d399 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期三, 02 七月 2025 11:06:11 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo --- ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml index 0e5811e..6c4e22f 100644 --- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml +++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml @@ -65,12 +65,14 @@ <result property="deptId" column="dept_id"/> <result property="deptName" column="dept_name"/> <result property="xh" column="xh"/> + <result property="allAmount" column="all_amount"/> </resultMap> <sql id="selectServiceFunddetailVo"> select ID, fundID, xh, + all_amount, InfoId, DonorNo, dept_id, @@ -150,6 +152,7 @@ <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> + <if test="allAmount != null ">and all_amount = #{allAmount}</if> </where> </select> @@ -245,6 +248,7 @@ a.subjecttype, a.dept_id, a.dept_name, + a.all_amount, a.subjecttypename from service_funddetail a, service_fund b @@ -285,7 +289,7 @@ and a.del_flag != 1 and b.id != #{fundID} and b.fundtaxtime - < #{taxTime} + <= #{taxTime} and b.fundtaxtime >= #{firstDay} and b.del_flag != 1 and b.ApplyType in (1 @@ -312,9 +316,9 @@ 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> + <!-- <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