From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/community/UnitV1ServiceDaoImplMapper.xml |  207 +++++++++++++++++++++++++--------------------------
 1 files changed, 101 insertions(+), 106 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/UnitV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/UnitV1ServiceDaoImplMapper.xml
index 139171f..8efa808 100644
--- a/java110-db/src/main/resources/mapper/community/UnitV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/UnitV1ServiceDaoImplMapper.xml
@@ -5,129 +5,124 @@
 <mapper namespace="unitV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨鍗曞厓鏂颁俊鎭� add by wuxw 2018-07-03 -->
     <insert id="saveUnitInfo" parameterType="Map">
         insert into building_unit(
-floor_id,layer_count,unit_area,unit_id,unit_num,lift,remark,user_id
-) values (
-#{floorId},#{layerCount},#{unitArea},#{unitId},#{unitNum},#{lift},#{remark},#{userId}
-)
+        floor_id,layer_count,unit_area,unit_id,unit_num,lift,remark,user_id
+        ) values (
+        #{floorId},#{layerCount},#{unitArea},#{unitId},#{unitNum},#{lift},#{remark},#{userId}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨ鍗曞厓鏂颁俊鎭� add by wuxw 2018-07-03 -->
     <select id="getUnitInfo" parameterType="Map" resultType="Map">
-        select  t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_area,t.unit_area unitArea,t.unit_id,t.unit_id unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id userId 
-from building_unit t 
-where 1 =1 
-<if test="floorId !=null and floorId != ''">
-   and t.floor_id= #{floorId}
-</if> 
-<if test="layerCount !=null and layerCount != ''">
-   and t.layer_count= #{layerCount}
-</if> 
-<if test="unitArea !=null and unitArea != ''">
-   and t.unit_area= #{unitArea}
-</if> 
-<if test="unitId !=null and unitId != ''">
-   and t.unit_id= #{unitId}
-</if> 
-<if test="unitNum !=null and unitNum != ''">
-   and t.unit_num= #{unitNum}
-</if> 
-<if test="lift !=null and lift != ''">
-   and t.lift= #{lift}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_area,t.unit_area
+        unitArea,t.unit_id,t.unit_id unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.status_cd,t.status_cd
+        statusCd,t.user_id,t.user_id userId
+        from building_unit t
+        where 1 =1
+        <if test="floorId !=null and floorId != ''">
+            and t.floor_id= #{floorId}
+        </if>
+        <if test="layerCount !=null and layerCount != ''">
+            and t.layer_count= #{layerCount}
+        </if>
+        <if test="unitArea !=null and unitArea != ''">
+            and t.unit_area= #{unitArea}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and t.unit_num= #{unitNum}
+        </if>
+        <if test='roomUnit == "Y"'>
+            and t.unit_num != '0'
+        </if>
+        <if test="lift !=null and lift != ''">
+            and t.lift= #{lift}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼鍗曞厓鏂颁俊鎭� add by wuxw 2018-07-03 -->
     <update id="updateUnitInfo" parameterType="Map">
-        update  building_unit t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="floorId !=null and floorId != ''">
-, t.floor_id= #{floorId}
-</if> 
-<if test="layerCount !=null and layerCount != ''">
-, t.layer_count= #{layerCount}
-</if> 
-<if test="unitArea !=null and unitArea != ''">
-, t.unit_area= #{unitArea}
-</if> 
-<if test="unitNum !=null and unitNum != ''">
-, t.unit_num= #{unitNum}
-</if> 
-<if test="lift !=null and lift != ''">
-, t.lift= #{lift}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
- where 1=1 <if test="unitId !=null and unitId != ''">
-and t.unit_id= #{unitId}
-</if> 
+        update building_unit t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="floorId !=null and floorId != ''">
+            , t.floor_id= #{floorId}
+        </if>
+        <if test="layerCount !=null and layerCount != ''">
+            , t.layer_count= #{layerCount}
+        </if>
+        <if test="unitArea !=null and unitArea != ''">
+            , t.unit_area= #{unitArea}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            , t.unit_num= #{unitNum}
+        </if>
+        <if test="lift !=null and lift != ''">
+            , t.lift= #{lift}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        where 1=1
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鍗曞厓鏂版暟閲� add by wuxw 2018-07-03 -->
-     <select id="queryUnitsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from building_unit t 
-where 1 =1 
-<if test="floorId !=null and floorId != ''">
-   and t.floor_id= #{floorId}
-</if> 
-<if test="layerCount !=null and layerCount != ''">
-   and t.layer_count= #{layerCount}
-</if> 
-<if test="unitArea !=null and unitArea != ''">
-   and t.unit_area= #{unitArea}
-</if> 
-<if test="unitId !=null and unitId != ''">
-   and t.unit_id= #{unitId}
-</if> 
-<if test="unitNum !=null and unitNum != ''">
-   and t.unit_num= #{unitNum}
-</if> 
-<if test="lift !=null and lift != ''">
-   and t.lift= #{lift}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-
-
-     </select>
+    <select id="queryUnitsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from building_unit t
+        where 1 =1
+        <if test="floorId !=null and floorId != ''">
+            and t.floor_id= #{floorId}
+        </if>
+        <if test="layerCount !=null and layerCount != ''">
+            and t.layer_count= #{layerCount}
+        </if>
+        <if test="unitArea !=null and unitArea != ''">
+            and t.unit_area= #{unitArea}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and t.unit_num= #{unitNum}
+        </if>
+        <if test='roomUnit == "Y"'>
+            and t.unit_num != '0'
+        </if>
+        <if test="lift !=null and lift != ''">
+            and t.lift= #{lift}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0