From c5065db1606300b0e4802bead9fe5bd06fdc1313 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 24 九月 2025 18:18:58 +0800
Subject: [PATCH] 添加两种缴费类型：退费缴费为退费单与被退费缴费为已退费0924
---
java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml
index 37e9ee6..5753193 100644
--- a/java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/PropertyWhiteListFlowDaoImplMapper.xml
@@ -27,7 +27,8 @@
<if test="category22 != null">category_22,</if>
<if test="chargeStart != null">charge_start,</if>
<if test="chargeEnd != null">charge_end,</if>
- <if test="communityId != null">community_id</if>
+ <if test="communityId != null">community_id,</if>
+ <if test="frequency != null">frequency</if>
</trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
#{chargeTime},
@@ -53,7 +54,8 @@
<if test="category22 != null">#{category22},</if>
<if test="chargeStart != null">#{chargeStart},</if>
<if test="chargeEnd != null">#{chargeEnd},</if>
- <if test="communityId != null">#{communityId}</if>
+ <if test="communityId != null">#{communityId},</if>
+ <if test="frequency != null">#{frequency}</if>
</trim>
</insert>
<select id="queryPropertyWhiteListFlow" parameterType="Map" resultType="Map">
@@ -82,7 +84,9 @@
category_22 AS category22,
charge_start AS chargeStart,
charge_end AS chargeEnd,
- community_id AS communityId
+ community_id AS communityId,
+ frequency,
+ SUBSTRING_INDEX(frequency, '-', -1) as order_fre
FROM
property_white_list_flow
<where>
@@ -93,7 +97,9 @@
<if test="endChargeTime != null">
AND charge_time <= #{endChargeTime}
</if>
-
+ <if test="frequencyLike != null">
+ AND frequency like concat(#{frequencyLike},"%")
+ </if>
<!-- 鎴垮彿鏌ヨ -->
<if test="roomId != null and roomId != ''">
AND room_id = #{roomId}
@@ -103,7 +109,9 @@
<if test="secondaryFeeTypeCd != null and secondaryFeeTypeCd != ''">
AND secondary_fee_type_cd = #{secondaryFeeTypeCd}
</if>
-
+ <if test="invoice_receipt_no != null">
+ AND invoice_receipt_no = #{invoiceReceiptNo}
+ </if>
<!-- 鏀惰垂閲戦鑼冨洿鏌ヨ -->
<if test="minChargeAmount != null">
AND charge_amount >= #{minChargeAmount}
@@ -131,7 +139,7 @@
and community_id = #{communityId}
</if>
</where>
- order by door_room_num,secondary_fee_type_cd,charge_start
+ order by order_fre desc,door_room_num,secondary_fee_type_cd,charge_start
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -226,4 +234,7 @@
</if>
</where>
</select>
+ <update id="updatePropertyWhiteListFlow">
+ update property_white_list_flow set frequency = #{frequency} where id = #{id}
+ </update>
</mapper>
--
Gitblit v1.8.0