java110 5 lat temu
rodzic
commit
5e24c15f8e

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/RoomDto.java

@@ -43,6 +43,7 @@ public class RoomDto extends PageDto implements Serializable {
 
 
     private String state;
+    private String stateName;
     private String unitNum;
 
     private List<RoomAttrDto> roomAttrDto;
@@ -271,4 +272,12 @@ public class RoomDto extends PageDto implements Serializable {
     public void setFloorArea(String floorArea) {
         this.floorArea = floorArea;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

+ 5 - 7
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -609,14 +609,12 @@
         SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,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,t.state,u.`unit_num` unitNum,
-        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea
-        FROM building_room t,building_unit u,f_floor f
+        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name stateName
+        FROM building_room t
+        left join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
+        LEFT JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
         WHERE 1 =1
-        AND t.`unit_id` = u.`unit_id`
-        AND u.`floor_id` = f.`floor_id`
-        AND f.`community_id` = t.`community_id`
-        AND u.`status_cd` = '0'
-        AND f.`status_cd` = '0'
         AND t.`community_id` = #{communityId}
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}