From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/fee/FeeManualCollectionServiceDaoImplMapper.xml | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/fee/FeeManualCollectionServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/fee/FeeManualCollectionServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index e488229..9f1bd6c
--- a/java110-db/src/main/resources/mapper/fee/FeeManualCollectionServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeManualCollectionServiceDaoImplMapper.xml
@@ -8,25 +8,24 @@
<!-- 淇濆瓨浜哄伐鎵樻敹淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveFeeManualCollectionInfo" parameterType="Map">
insert into fee_manual_collection(
- square_price,owner_name,link,room_area,remark,state,owner_id,community_id,collection_id,room_id,room_name
+ owner_name,link,room_area,remark,state,owner_id,community_id,collection_id,room_id,room_name
) values (
- #{squarePrice},#{ownerName},#{link},#{roomArea},#{remark},#{state},#{ownerId},#{communityId},#{collectionId},#{roomId},#{roomName}
+ #{ownerName},#{link},#{roomArea},#{remark},#{state},#{ownerId},#{communityId},#{collectionId},#{roomId},#{roomName}
)
</insert>
<!-- 鏌ヨ浜哄伐鎵樻敹淇℃伅 add by wuxw 2018-07-03 -->
<select id="getFeeManualCollectionInfo" parameterType="Map" resultType="Map">
- select t.square_price,t.square_price squarePrice,t.owner_name,t.owner_name
+ select t.owner_name,t.owner_name
ownerName,t.link,t.room_area,t.room_area roomArea,t.remark,t.status_cd,t.status_cd
statusCd,t.state,t.owner_id,t.owner_id ownerId,t.community_id,t.community_id
communityId,t.collection_id,t.collection_id collectionId,t.room_id,t.room_id roomId,t.room_name,t.room_name
- roomName
+ roomName,td.name stateName
from fee_manual_collection t
+ left join t_dict td on t.state = td.status_cd and td.table_name = 'fee_manual_collection' and td.table_columns = 'state'
where 1 =1
- <if test="squarePrice !=null and squarePrice != ''">
- and t.square_price= #{squarePrice}
- </if>
+
<if test="ownerName !=null and ownerName != ''">
and t.owner_name= #{ownerName}
</if>
@@ -74,9 +73,6 @@
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if>
- <if test="squarePrice !=null and squarePrice != ''">
- , t.square_price= #{squarePrice}
- </if>
<if test="ownerName !=null and ownerName != ''">
, t.owner_name= #{ownerName}
</if>
@@ -108,6 +104,9 @@
, t.room_name= #{roomName}
</if>
where 1=1
+ <if test="collectionId !=null and collectionId != ''">
+ and t.collection_id= #{collectionId}
+ </if>
</update>
<!-- 鏌ヨ浜哄伐鎵樻敹鏁伴噺 add by wuxw 2018-07-03 -->
@@ -115,9 +114,6 @@
select count(1) count
from fee_manual_collection t
where 1 =1
- <if test="squarePrice !=null and squarePrice != ''">
- and t.square_price= #{squarePrice}
- </if>
<if test="ownerName !=null and ownerName != ''">
and t.owner_name= #{ownerName}
</if>
--
Gitblit v1.8.0