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/FeeManualCollectionServiceDaoImplMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 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 de52a46..9f1bd6c
--- a/java110-db/src/main/resources/mapper/fee/FeeManualCollectionServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/fee/FeeManualCollectionServiceDaoImplMapper.xml
@@ -21,8 +21,9 @@
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="ownerName !=null and ownerName != ''">
@@ -103,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 -->
--
Gitblit v1.8.0