From 4e4b96ef73db8d36d1cc7e2ec87d38d397c96078 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 26 一月 2023 16:26:48 +0800
Subject: [PATCH] 优化审核代码
---
java110-db/src/main/resources/mapper/fee/ApplyRoomDiscountServiceDaoImplMapper.xml | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/ApplyRoomDiscountServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/ApplyRoomDiscountServiceDaoImplMapper.xml
index 1d64576..dd4b377 100755
--- a/java110-db/src/main/resources/mapper/fee/ApplyRoomDiscountServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/ApplyRoomDiscountServiceDaoImplMapper.xml
@@ -4,16 +4,15 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="applyRoomDiscountServiceDaoImpl">
-
<!-- 淇濆瓨鎴垮眿鎶樻墸鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveApplyRoomDiscountInfo" parameterType="Map">
insert into apply_room_discount(
- apply_type,ard_id,create_user_name,create_user_tel,create_remark,check_user_id,check_remark,room_id,room_name,review_user_id,review_remark,start_time,end_time,state,community_id,discount_id
+ apply_type,ard_id,create_user_name,create_user_tel,create_remark,check_user_id,check_remark,room_id,room_name,review_user_id,review_remark,start_time,end_time,state,community_id,discount_id,in_use,fee_id,return_way,return_amount
) values (
- #{applyType},#{ardId},#{createUserName},#{createUserTel},#{createRemark},#{checkUserId},#{checkRemark},#{roomId},#{roomName},#{reviewUserId},#{reviewRemark},#{startTime},#{endTime},#{state},#{communityId},#{discountId}
+ #{applyType},#{ardId},#{createUserName},#{createUserTel},#{createRemark},#{checkUserId},#{checkRemark},#{roomId},#{roomName},#{reviewUserId},#{reviewRemark},#{startTime},#{endTime},#{state},
+ #{communityId},#{discountId},#{inUse},#{feeId},#{returnWay},#{returnAmount}
)
</insert>
-
<!-- 鏌ヨ鎴垮眿鎶樻墸鐢宠淇℃伅 add by wuxw 2018-07-03 -->
<select id="getApplyRoomDiscountInfo" parameterType="Map" resultType="Map">
@@ -24,13 +23,14 @@
roomName,t.review_user_id,t.review_user_id reviewUserId,t.review_remark,t.review_remark
reviewRemark,t.start_time,t.start_time startTime,t.end_time,t.end_time
endTime,t.state,td.name stateName,t.community_id,t.community_id communityId,t.discount_id,t.discount_id
- discountId,
- ardt.type_name applyTypeName
+ discountId,t.in_use,t.in_use inUse,t.fee_id,t.fee_id feeId,t.return_way,t.return_way returnWay,t.return_amount,t.return_amount returnAmount,t.create_time,t.create_time createTime,
+ ardt.type_name applyTypeName,fd.discount_name discountName
from apply_room_discount t
- left join t_dict td on t.state = td.status_cd and td.table_name='apply_room_discount' and td.table_columns =
- 'state'
+ left join t_dict td on t.state = td.status_cd and td.table_name='apply_room_discount' and td.table_columns
+ ='state'
left join apply_room_discount_type ardt on t.apply_type = ardt.apply_type and t.community_id = ardt.community_id
and ardt.status_cd = '0'
+ left join fee_discount fd on t.discount_id=fd.discount_id
where t.status_cd = '0'
<if test="applyType !=null and applyType != ''">
and t.apply_type= #{applyType}
@@ -79,6 +79,21 @@
</if>
<if test="discountId !=null and discountId != ''">
and t.discount_id= #{discountId}
+ </if>
+ <if test="inUse !=null and inUse != ''">
+ and t.in_use= #{inUse}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
+ <if test="returnWay !=null and returnWay != ''">
+ and t.return_way= #{returnWay}
+ </if>
+ <if test="returnAmount !=null and returnAmount != ''">
+ and t.return_amount= #{returnAmount}
+ </if>
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -148,6 +163,18 @@
<if test="discountId !=null and discountId != ''">
and t.discount_id= #{discountId}
</if>
+ <if test="inUse !=null and inUse != ''">
+ and t.in_use= #{inUse}
+ </if>
+ <if test="returnWay !=null and returnWay != ''">
+ and t.return_way= #{returnWay}
+ </if>
+ <if test="returnAmount !=null and returnAmount != ''">
+ and t.return_amount= #{returnAmount}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
order by t.create_time desc limit 0,1
</select>
@@ -197,11 +224,25 @@
<if test="discountId !=null and discountId != ''">
, t.discount_id= #{discountId}
</if>
+ <if test="inUse !=null and inUse != ''">
+ , t.in_use= #{inUse}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ , t.fee_id= #{feeId}
+ </if>
+ <if test="returnWay !=null and returnWay != ''">
+ , t.return_way= #{returnWay}
+ </if>
+ <if test="returnAmount !=null and returnAmount != ''">
+ , t.return_amount= #{returnAmount}
+ </if>
+ <if test="bId !=null and bId != ''">
+ , t.b_id= #{bId}
+ </if>
where 1=1
<if test="ardId !=null and ardId != ''">
and t.ard_id= #{ardId}
</if>
-
</update>
<!-- 鏌ヨ鎴垮眿鎶樻墸鐢宠鏁伴噺 add by wuxw 2018-07-03 -->
@@ -257,8 +298,18 @@
<if test="discountId !=null and discountId != ''">
and t.discount_id= #{discountId}
</if>
-
-
+ <if test="inUse !=null and inUse != ''">
+ and t.in_use= #{inUse}
+ </if>
+ <if test="returnWay !=null and returnWay != ''">
+ and t.return_way= #{returnWay}
+ </if>
+ <if test="returnAmount !=null and returnAmount != ''">
+ and t.return_amount= #{returnAmount}
+ </if>
+ <if test="feeId !=null and feeId != ''">
+ and t.fee_id= #{feeId}
+ </if>
</select>
</mapper>
--
Gitblit v1.8.0