From 49120f2b9db33455756a911e56cfefd7c3120a14 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 17:05:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
index c960411..9abda69 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
@@ -6,18 +6,19 @@
<!-- 鏂� SP 杩斿洖 dept_id / dept_name 涓嬪垝绾垮垪锛岄」鐩湭寮�鍚� mapUnderscoreToCamelCase锛岄渶鏄惧紡鏄犲皠 -->
<resultMap id="SpStatBonusResult" type="com.ruoyi.project.domain.SpStatBonus">
- <result property="bonusmonth" column="bonusmonth"/>
<result property="deptId" column="dept_id"/>
<result property="deptName" column="dept_name"/>
<result property="beneficiaryno" column="BeneficiaryNo"/>
<result property="beneficiaryname" column="BeneficiaryName"/>
<result property="amount" column="amount"/>
+ <result property="mamount" column="mamount"/>
+ <result property="samount" column="samount"/>
+ <result property="yamount" column="yamount"/>
</resultMap>
<select id="getListBySpStatBonus" statementType="CALLABLE"
resultMap="SpStatBonusResult">
- call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR
- })
+ call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
</select>
</mapper>
--
Gitblit v1.9.3