From cdd0abecb96bb1b6dfa32e8a9cbb406ce3b4ed7d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 八月 2021 17:02:08 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/PrestoreFeeServiceDaoImplMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PrestoreFeeServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PrestoreFeeServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index c1531bf..c163956
--- a/java110-db/src/main/resources/mapper/fee/PrestoreFeeServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PrestoreFeeServiceDaoImplMapper.xml
@@ -11,9 +11,9 @@
<!-- 淇濆瓨棰勫瓨璐圭敤淇℃伅 add by wuxw 2018-07-03 -->
<insert id="savePrestoreFeeInfo" parameterType="Map">
insert into prestore_fee(
-prestore_fee_amount,prestore_fee_obj_type,prestore_fee_id,remark,state,community_id,prestore_fee_type,room_id
+prestore_fee_amount,reason,prestore_fee_obj_type,prestore_fee_id,remark,state,community_id,prestore_fee_type,room_id
) values (
-#{prestoreFeeAmount},#{prestoreFeeObjType},#{prestoreFeeId},#{remark},#{state},#{communityId},#{prestoreFeeType},#{roomId}
+#{prestoreFeeAmount},#{reason},#{prestoreFeeObjType},#{prestoreFeeId},#{remark},#{state},#{communityId},#{prestoreFeeType},#{roomId}
)
</insert>
@@ -21,11 +21,14 @@
<!-- 鏌ヨ棰勫瓨璐圭敤淇℃伅 add by wuxw 2018-07-03 -->
<select id="getPrestoreFeeInfo" parameterType="Map" resultType="Map">
- select t.prestore_fee_amount,t.prestore_fee_amount prestoreFeeAmount,t.prestore_fee_obj_type,t.prestore_fee_obj_type prestoreFeeObjType,t.prestore_fee_id,t.prestore_fee_id prestoreFeeId,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.prestore_fee_type,t.prestore_fee_type prestoreFeeType,t.room_id,t.room_id roomId
+ select t.prestore_fee_amount,t.prestore_fee_amount prestoreFeeAmount,t.reason,t.prestore_fee_obj_type,t.prestore_fee_obj_type prestoreFeeObjType,t.prestore_fee_id,t.prestore_fee_id prestoreFeeId,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.prestore_fee_type,t.prestore_fee_type prestoreFeeType,t.room_id,t.room_id roomId
from prestore_fee t
where 1 =1
<if test="prestoreFeeAmount !=null and prestoreFeeAmount != ''">
and t.prestore_fee_amount= #{prestoreFeeAmount}
+</if>
+<if test="reason !=null and reason != ''">
+ and t.reason= #{reason}
</if>
<if test="prestoreFeeObjType !=null and prestoreFeeObjType != ''">
and t.prestore_fee_obj_type= #{prestoreFeeObjType}
@@ -70,6 +73,9 @@
<if test="prestoreFeeAmount !=null and prestoreFeeAmount != ''">
, t.prestore_fee_amount= #{prestoreFeeAmount}
</if>
+<if test="reason !=null and reason != ''">
+, t.reason= #{reason}
+</if>
<if test="prestoreFeeObjType !=null and prestoreFeeObjType != ''">
, t.prestore_fee_obj_type= #{prestoreFeeObjType}
</if>
@@ -102,6 +108,9 @@
<if test="prestoreFeeAmount !=null and prestoreFeeAmount != ''">
and t.prestore_fee_amount= #{prestoreFeeAmount}
</if>
+<if test="reason !=null and reason != ''">
+ and t.reason= #{reason}
+</if>
<if test="prestoreFeeObjType !=null and prestoreFeeObjType != ''">
and t.prestore_fee_obj_type= #{prestoreFeeObjType}
</if>
--
Gitblit v1.8.0