From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 java110-bean/src/main/java/com/java110/dto/RoomDto.java |  128 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 120 insertions(+), 8 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 0abe910..7a5cd99
--- a/java110-bean/src/main/java/com/java110/dto/RoomDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/RoomDto.java
@@ -1,5 +1,7 @@
 package com.java110.dto;
 
+import com.java110.dto.fee.FeeDto;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -14,36 +16,58 @@
  **/
 public class RoomDto extends PageDto implements Serializable {
 
-    public static final String STATE_SELL = "2001";
-    public static final String STATE_FREE = "2002";
+    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 unitPrice;
+    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;
@@ -51,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() {
@@ -253,4 +277,92 @@
     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