Merge branch 'master' of http://121.42.41.42:7070/r/epdc-cloud-client-yushan

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/FamilyMemberInfoFormDTO.java

@@ -22,6 +22,9 @@ public class FamilyMemberInfoFormDTO implements Serializable {
     // ID
     private Long recordId;
 
+    // 房屋ID
+    private Long unitId;
+
     // 姓名
     @NotBlank(message = "姓名不能为空")
     private String userName;

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/GetHouseInfoFormDTO.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.personroom.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 获取房屋信息
+ *
+ * @author wanggongfeng
+ * @since v1.0.0 2022-06-09
+ */
+@Data
+public class GetHouseInfoFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 房屋编码
+     */
+    @NotBlank(message = "房屋编码不能为空")
+	private String roomCode;
+
+
+
+}

epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/HouseInfoResultDTO.java

@@ -0,0 +1,230 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.personroom.result;
+
+import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 房屋信息
+ *
+ * @author zhy qu@elink-cn.com
+ * @since v1.0.0 2022-02-15
+ */
+@Data
+public class HouseInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private Long id;
+
+    /**
+     * 家庭成员列表
+     */
+    private List<FamilyMemberInfoResultDTO> members;
+
+    /**
+     * 道路名称
+     */
+    private String roadName;
+
+    /**
+     * 小区.村ID
+     */
+	private Long buildingId;
+
+    /**
+     * 单元
+     */
+	private String unit;
+
+    /**
+     * 房间号
+     */
+	private String roomNo;
+
+    /**
+     * 房屋类型
+     */
+	private String roomType;
+
+    /**
+     * 房屋用途
+     */
+	private String roomUse;
+
+    /**
+     * 房屋状态
+     */
+    private String roomStatus;
+
+    /**
+     * 居住情况
+     */
+    private String livingStatus;
+
+    /**
+     * 房主姓名
+     */
+	private String ownerName;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 是否出租
+     */
+    private String isRental;
+
+    /**
+     * 出租用途
+     */
+    private String rentalPurpose;
+
+    /**
+     * 承租人姓名
+     */
+    private String lesseeName;
+
+    /**
+     * 承租人身份证
+     */
+    private String lesseeIdCard;
+
+    /**
+     * 承租人手机
+     */
+    private String lesseeMobile;
+
+    /**
+     * 承租人单位
+     */
+    private String lesseeUnit;
+
+    /**
+     * 承租时间（日）
+     */
+    private String lesseeTime;
+
+    /**
+     * 承租日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date lesseeDate;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 逻辑删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 社区/村庄
+     */
+    private String communityName;
+
+    /**
+     * 社区/村庄ID
+     */
+    private String communityId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 街道名
+     */
+    private String streetName;
+
+    /**
+     * 街道编码
+     */
+    private String streetId;
+
+    /**
+     * 楼栋名
+     */
+    private String buildingName;
+
+    /**
+     * 小区名
+     */
+    private String plotName;
+
+    /**
+     * 房屋编码
+     */
+    private String roomCode;
+
+    /**
+     * 房屋码(5位数字自增)
+     */
+    private Integer roomMaCode;
+}