调整房屋查询sql信息

CommunityService/src/main/java/com/java110/community/dao/IRoomServiceDao.java

@@ -72,6 +72,14 @@ public interface IRoomServiceDao {
      */
     int queryRoomsCount(Map info);
 
+    /**
+     * 查询小区房屋总数
+     *
+     * @param info 小区房屋信息
+     * @return 小区房屋数量
+     */
+    int queryRoomsByCommunityIdCount(Map info);
+
 
     /**
      * 查询小区房屋信息

CommunityService/src/main/java/com/java110/community/dao/impl/RoomServiceDaoImpl.java

@@ -130,6 +130,17 @@ public class RoomServiceDaoImpl extends BaseServiceDao implements IRoomServiceDa
         return Integer.parseInt(businessRoomInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public int queryRoomsByCommunityIdCount(Map info) {
+        logger.debug("查询小区房屋数据 入参 info : {}", info);
+
+        List<Map> businessRoomInfos = sqlSessionTemplate.selectList("roomServiceDaoImpl.queryRoomsByCommunityIdCount", info);
+        if (businessRoomInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessRoomInfos.get(0).get("count").toString());    }
+
     @Override
     public List<Map> getRoomInfoByCommunityId(Map info) {
         logger.debug("查询小区房屋信息 入参 info : {}", info);

CommunityService/src/main/java/com/java110/community/smo/impl/RoomInnerServiceSMOImpl.java

@@ -140,7 +140,7 @@ public class RoomInnerServiceSMOImpl extends BaseServiceSMO implements IRoomInne
 
     @Override
     public int queryRoomsCount(@RequestBody RoomDto roomDto) {
-        return roomServiceDaoImpl.queryRoomsCount(BeanConvertUtil.beanCovertMap(roomDto));
+        return roomServiceDaoImpl.queryRoomsByCommunityIdCount(BeanConvertUtil.beanCovertMap(roomDto));
     }
 
     public IRoomServiceDao getRoomServiceDaoImpl() {

java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -24,6 +24,8 @@ public class RoomDto extends PageDto implements Serializable {
     private String roomNum;
     private String unitId;
     private String apartment;
+    private String communityId;
+    private String floorId;
 
     private List<RoomAttrDto> roomAttrDto;
 
@@ -137,4 +139,21 @@ public class RoomDto extends PageDto implements Serializable {
     public void setRoomAttrDto(List<RoomAttrDto> roomAttrDto) {
         this.roomAttrDto = roomAttrDto;
     }
+
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(String floorId) {
+        this.floorId = floorId;
+    }
 }

java110-config/src/main/resources/mapper/room/RoomServiceDaoImplMapper.xml

@@ -243,6 +243,66 @@ where 1 =1
 
      </select>
 
+
+
+    <!-- 查询小区房屋数量 add by wuxw 2018-07-03 -->
+    <select id="queryRoomsByCommunityIdCount" parameterType="Map" resultType="Map">
+        select  count(1) count
+        FROM building_room t,s_community c,s_community_member cm,building_unit u,f_floor f
+            WHERE 1 =1
+            AND t.`unit_id` = u.`unit_id`
+            AND u.`floor_id` = f.`floor_id`
+            AND f.`floor_id` = cm.`member_id`
+            AND cm.`community_id` = c.`community_id`
+            AND cm.`member_type_cd` = '390001200004'
+            AND c.`status_cd` = '0'
+            AND cm.`status_cd` = '0'
+            AND u.`status_cd` = '0'
+            AND f.`status_cd` = '0'
+            AND c.`community_id` = #{communityId}
+        <if test="floorId !=null and floorId != ''">
+            and f.`floor_id`= #{floorId}
+        </if>
+        <if test="unitPrice !=null and unitPrice != ''">
+            and t.unit_price= #{unitPrice}
+        </if>
+        <if test="section !=null and section != ''">
+            and t.section= #{section}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="layer !=null and layer != ''">
+            and t.layer= #{layer}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            and t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="roomNum !=null and roomNum != ''">
+            and t.room_num= #{roomNum}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="apartment !=null and apartment != ''">
+            and t.apartment= #{apartment}
+        </if>
+
+
+    </select>
+
     <!-- 查询小区房屋信息 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoByCommunityId" parameterType="Map" resultType="Map">
         SELECT  t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment