From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/user/RentingPoolServiceDaoImplMapper.xml |   61 +++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/RentingPoolServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/RentingPoolServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 7086aaa..f109186
--- a/java110-db/src/main/resources/mapper/user/RentingPoolServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/RentingPoolServiceDaoImplMapper.xml
@@ -8,9 +8,11 @@
     <!-- 淇濆瓨鎴垮眿鍑虹淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveRentingPoolInfo" parameterType="Map">
         insert into renting_pool(
-        latitude,owner_tel,renting_config_id,renting_desc,renting_title,check_in_date,renting_id,room_id,payment_type,owner_name,price,state,community_id,longitude
+        latitude,owner_tel,renting_config_id,renting_desc,renting_title,check_in,renting_id,room_id,payment_type,owner_name,
+        price,state,community_id,longitude,community_name
         ) values (
-        #{latitude},#{ownerTel},#{rentingConfigId},#{rentingDesc},#{rentingTitle},#{checkInDate},#{rentingId},#{roomId},#{paymentType},#{ownerName},#{price},#{state},#{communityId},#{longitude}
+        #{latitude},#{ownerTel},#{rentingConfigId},#{rentingDesc},#{rentingTitle},#{checkIn},#{rentingId},#{roomId},
+        #{paymentType},#{ownerName},#{price},#{state},#{communityId},#{longitude},#{communityName}
         )
     </insert>
 
@@ -19,11 +21,17 @@
     <select id="getRentingPoolInfo" parameterType="Map" resultType="Map">
         select t.latitude,t.owner_tel,t.owner_tel ownerTel,t.renting_config_id,t.renting_config_id
         rentingConfigId,t.renting_desc,t.renting_desc rentingDesc,t.status_cd,t.status_cd
-        statusCd,t.renting_title,t.renting_title rentingTitle,t.check_in_date,t.check_in_date
-        checkInDate,t.renting_id,t.renting_id rentingId,t.room_id,t.room_id roomId,t.payment_type,t.payment_type
+        statusCd,t.renting_title,t.renting_title rentingTitle,t.check_in,t.check_in
+        checkIn,t.renting_id,t.renting_id rentingId,t.room_id,t.room_id roomId,t.payment_type,t.payment_type
         paymentType,t.owner_name,t.owner_name ownerName,t.price,t.state,t.community_id,t.community_id
-        communityId,t.longitude
+        communityId,t.longitude,td.name stateName,td2.name paymentTypeName,rc.renting_type rentingType,
+        rc.service_owner_rate serviceOwnerRate,rc.service_tenant_rate serviceTenantRate,rc.admin_separate_rate adminSeparateRate,
+        rc.proxy_separate_rate proxySeparateRate,rc.property_separate_rate propertySeparateRate,rc.service_price servicePrice,rc.renting_formula rentingFormula,
+        t.community_name communityName
         from renting_pool t
+        left join t_dict td on td.status_cd = t.state and td.table_name = 'renting_pool' and td.table_columns = 'state'
+        left join t_dict td2 on td2.status_cd = t.payment_type and td2.table_name = 'renting_pool' and td2.table_columns = 'payment_type'
+        left join renting_config rc on t.renting_config_id = rc.renting_config_id and rc.status_cd = '0'
         where 1 =1
         <if test="latitude !=null and latitude != ''">
             and t.latitude= #{latitude}
@@ -43,8 +51,8 @@
         <if test="rentingTitle !=null and rentingTitle != ''">
             and t.renting_title= #{rentingTitle}
         </if>
-        <if test="checkInDate !=null and checkInDate != ''">
-            and t.check_in_date= #{checkInDate}
+        <if test="checkIn !=null and checkIn != ''">
+            and t.check_in= #{checkIn}
         </if>
         <if test="rentingId !=null and rentingId != ''">
             and t.renting_id= #{rentingId}
@@ -64,8 +72,22 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+
+        <if test="rentingType !=null and rentingType != ''">
+            and rc.renting_type= #{rentingType}
+        </if>
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
+        </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name like concat('%',#{communityName},'%')
         </if>
         <if test="longitude !=null and longitude != ''">
             and t.longitude= #{longitude}
@@ -99,8 +121,8 @@
         <if test="rentingTitle !=null and rentingTitle != ''">
             , t.renting_title= #{rentingTitle}
         </if>
-        <if test="checkInDate !=null and checkInDate != ''">
-            , t.check_in_date= #{checkInDate}
+        <if test="checkIn !=null and checkIn != ''">
+            , t.check_in= #{checkIn}
         </if>
         <if test="roomId !=null and roomId != ''">
             , t.room_id= #{roomId}
@@ -134,6 +156,9 @@
     <select id="queryRentingPoolsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from renting_pool t
+        left join t_dict td on td.status_cd = t.state and td.table_name = 'renting_pool' and td.table_columns = 'state'
+        left join t_dict td2 on td2.status_cd = t.payment_type and td2.table_name = 'renting_pool' and td2.table_columns = 'payment_type'
+        left join renting_config rc on t.renting_config_id = rc.renting_config_id and rc.status_cd = '0'
         where 1 =1
         <if test="latitude !=null and latitude != ''">
             and t.latitude= #{latitude}
@@ -153,8 +178,8 @@
         <if test="rentingTitle !=null and rentingTitle != ''">
             and t.renting_title= #{rentingTitle}
         </if>
-        <if test="checkInDate !=null and checkInDate != ''">
-            and t.check_in_date= #{checkInDate}
+        <if test="checkIn !=null and checkIn != ''">
+            and t.check_in= #{checkIn}
         </if>
         <if test="rentingId !=null and rentingId != ''">
             and t.renting_id= #{rentingId}
@@ -174,9 +199,23 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+
+        <if test="rentingType !=null and rentingType != ''">
+            and rc.renting_type= #{rentingType}
+        </if>
+        <if test="states !=null ">
+            and t.state in
+            <foreach collection="states" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="communityName !=null and communityName != ''">
+            and t.community_name like concat('%',#{communityName},'%')
+        </if>
         <if test="longitude !=null and longitude != ''">
             and t.longitude= #{longitude}
         </if>

--
Gitblit v1.8.0