java110 3 år sedan
förälder
incheckning
c1810d6d2f

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

@@ -78,6 +78,8 @@ public class RoomDto extends PageDto implements Serializable {
     private Date startTime;
     private Date endTime;
 
+    private String roomName;
+
 
     private String statusCd = "0";
 
@@ -418,4 +420,12 @@ public class RoomDto extends PageDto implements Serializable {
     public void setOwnerNameLike(String ownerNameLike) {
         this.ownerNameLike = ownerNameLike;
     }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
 }

+ 10 - 0
java110-bean/src/main/java/com/java110/vo/api/ApiRoomDataVo.java

@@ -43,6 +43,8 @@ public class ApiRoomDataVo implements Serializable {
     private String startTime;
     private String endTime;
 
+    private String roomName;
+
     private List<RoomAttrDto> roomAttrDto;
 
 
@@ -269,4 +271,12 @@ public class ApiRoomDataVo implements Serializable {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
 }

+ 2 - 1
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -666,7 +666,8 @@
         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,td.name
         stateName,t.room_type roomType,t.room_type,t.`community_id` communityId,td1.`name` roomSubTypeName
-        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+        ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
+        concat(f.floor_num,'-',u.unit_num,'-',t.room_num) roomName
         FROM building_room t
         inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
         inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` =