From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/RoomDto.java |  249 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 244 insertions(+), 5 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/RoomDto.java b/java110-bean/src/main/java/com/java110/dto/RoomDto.java
old mode 100644
new mode 100755
index 6ea988a..7a5cd99
--- a/java110-bean/src/main/java/com/java110/dto/RoomDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/RoomDto.java
@@ -1,7 +1,10 @@
 package com.java110.dto;
 
+import com.java110.dto.fee.FeeDto;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -13,16 +16,58 @@
  **/
 public class RoomDto extends PageDto implements Serializable {
 
-    private String unitPrice;
+    public static final String STATE_SELL = "2001"; // 宸插叆浣�
+    public static final String STATE_FREE = "2002"; //鏈叆浣�
+    public static final String STATE_DELIVERY = "2003";//宸蹭氦鎴�
+    public static final String STATE_RENOVATION = "2005";//宸茶淇�
+    public static final String STATE_SHOP_FIRE = "2006";//宸茬粡绉�
+    public static final String STATE_SHOP_SELL = "2007";//宸插敭
+    public static final String STATE_SHOP_FREE = "2008";//绌洪棽
+    public static final String ROOM_TYPE_ROOM = "1010301";//鏅�氭埧灞�
+    public static final String ROOM_TYPE_SHOPS = "2020602";//鍟嗛摵
+
+    public static final String ROOM_SUB_TYPE_PERSON = "110";
+    public static final String ROOM_SUB_TYPE_WORK = "119";
+    public static final String ROOM_SUB_TYPE_HOUSE = "120";
+
+
+    private String feeCoefficient;
     private String section;
     private String remark;
     private String userId;
     private String roomId;
+    private String[] roomIds;
     private String layer;
+    private String[] layers;
     private String builtUpArea;
     private String roomNum;
     private String unitId;
+    private String unitArea;
     private String apartment;
+    private String apartmentName;
+    private String communityId;
+    private String floorId;
+    private String floorNum;
+    private String floorArea;
+    private String userName;
+    private String ownerId;
+    private String ownerName;
+    private String idCard;
+    private String link;
+    private String roomType;
+    private String roomSubType;
+    private String roomSubTypeName;
+    private String roomRent;
+    private String roomArea;
+
+    private String state;
+    private String[] states;
+    private String stateName;
+    private String unitNum;
+
+    private List<RoomAttrDto> roomAttrDto;
+
+    private List<FeeDto> fees;
 
 
     private Date createTime;
@@ -30,12 +75,12 @@
     private String statusCd = "0";
 
 
-    public String getUnitPrice() {
-        return unitPrice;
+    public String getFeeCoefficient() {
+        return feeCoefficient;
     }
 
-    public void setUnitPrice(String unitPrice) {
-        this.unitPrice = unitPrice;
+    public void setFeeCoefficient(String feeCoefficient) {
+        this.feeCoefficient = feeCoefficient;
     }
 
     public String getSection() {
@@ -126,4 +171,198 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public List<RoomAttrDto> getRoomAttrDto() {
+        return roomAttrDto;
+    }
+
+    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;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+
+    public String[] getRoomIds() {
+        return roomIds;
+    }
+
+    public void setRoomIds(String[] roomIds) {
+        this.roomIds = roomIds;
+    }
+
+    public String getApartmentName() {
+        return apartmentName;
+    }
+
+    public void setApartmentName(String apartmentName) {
+        this.apartmentName = apartmentName;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    public String getUnitArea() {
+        return unitArea;
+    }
+
+    public void setUnitArea(String unitArea) {
+        this.unitArea = unitArea;
+    }
+
+    public String getFloorArea() {
+        return floorArea;
+    }
+
+    public void setFloorArea(String floorArea) {
+        this.floorArea = floorArea;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
+
+    public String getRoomType() {
+        return roomType;
+    }
+
+    public void setRoomType(String roomType) {
+        this.roomType = roomType;
+    }
+
+    public List<FeeDto> getFees() {
+        return fees;
+    }
+
+    public void setFees(List<FeeDto> fees) {
+        this.fees = fees;
+    }
+
+    public String[] getLayers() {
+        return layers;
+    }
+
+    public void setLayers(String[] layers) {
+        this.layers = layers;
+    }
+
+    public String getRoomSubType() {
+        return roomSubType;
+    }
+
+    public void setRoomSubType(String roomSubType) {
+        this.roomSubType = roomSubType;
+    }
+
+    public String getRoomRent() {
+        return roomRent;
+    }
+
+    public void setRoomRent(String roomRent) {
+        this.roomRent = roomRent;
+    }
+
+    public String getRoomArea() {
+        return roomArea;
+    }
+
+    public void setRoomArea(String roomArea) {
+        this.roomArea = roomArea;
+    }
+
+    public String getRoomSubTypeName() {
+        return roomSubTypeName;
+    }
+
+    public void setRoomSubTypeName(String roomSubTypeName) {
+        this.roomSubTypeName = roomSubTypeName;
+    }
 }

--
Gitblit v1.8.0