From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/RentingPoolFlowServiceDaoImplMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/RentingPoolFlowServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/RentingPoolFlowServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 570817e..e6930df
--- a/java110-db/src/main/resources/mapper/user/RentingPoolFlowServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/RentingPoolFlowServiceDaoImplMapper.xml
@@ -19,8 +19,9 @@
     <select id="getRentingPoolFlowInfo" parameterType="Map" resultType="Map">
         select t.deal_time,t.deal_time dealTime,t.user_name,t.user_name useName,t.context,t.user_tel,t.user_tel
         userTel,t.status_cd,t.status_cd statusCd,t.state,t.user_role,t.user_role userRole,t.community_id,t.community_id
-        communityId,t.flow_id,t.flow_id flowId,t.renting_id,t.renting_id rentingId
+        communityId,t.flow_id,t.flow_id flowId,t.renting_id,t.renting_id rentingId,td.name stateName
         from renting_pool_flow t
+        left join t_dict td on td.status_cd = t.state and td.table_name =  'renting_pool_flow' and td.table_columns = 'state'
         where 1 =1
         <if test="dealTime !=null and dealTime != ''">
             and t.deal_time= #{dealTime}

--
Gitblit v1.8.0