Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2022-07-06 92ed53e44fb2da1f91b8fb9932af8ff433febe83

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

old mode 100644
new mode 100755
@@ -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;
@@ -15,9 +17,18 @@
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_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;
@@ -27,22 +38,32 @@
    private String roomId;
    private String[] roomIds;
    private String layer;
    private String[] layers;
    private String builtUpArea;
    private String roomNum;
    private String roomNumLike;

    private String unitId;
    private String unitArea;
    private String apartment;
    private String apartmentName;
    private String communityId;
    private String floorId;
    private String[] floorIds;
    private String floorNum;
    private String floorArea;
    private String userName;
    private String ownerId;
    private String ownerName;
    private String ownerNameLike;
    private String idCard;
    private String link;

    private String roomType;
    private String roomSubType;
    private String roomSubTypeName;
    private String roomRent;
    private String roomArea;
    private String oweAmount;

    private String state;
    private String[] states;
@@ -51,11 +72,14 @@

    private List<RoomAttrDto> roomAttrDto;

    private List<FeeDto> fees;

    private Date createTime;
    private Date startTime;
    private Date endTime;


    private String statusCd = "0";


    public String getFeeCoefficient() {
        return feeCoefficient;
@@ -219,7 +243,6 @@
        this.floorNum = floorNum;
    }


    public String[] getRoomIds() {
        return roomIds;
    }
@@ -291,4 +314,108 @@
    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;
    }

    public Date getStartTime() {
        return startTime;
    }

    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }

    public Date getEndTime() {
        return endTime;
    }

    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }

    public String getOweAmount() {
        return oweAmount;
    }

    public void setOweAmount(String oweAmount) {
        this.oweAmount = oweAmount;
    }

    public String[] getFloorIds() {
        return floorIds;
    }

    public void setFloorIds(String[] floorIds) {
        this.floorIds = floorIds;
    }

    public String getRoomNumLike() {
        return roomNumLike;
    }

    public void setRoomNumLike(String roomNumLike) {
        this.roomNumLike = roomNumLike;
    }

    public String getOwnerNameLike() {
        return ownerNameLike;
    }

    public void setOwnerNameLike(String ownerNameLike) {
        this.ownerNameLike = ownerNameLike;
    }
}