diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java index 0b71433..2ba854f 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java @@ -224,6 +224,11 @@ public class EpidemicBuildingUnitDTO implements Serializable { */ private Integer roomMaCode; + /** + * 房屋码(5位数字自增) + */ + private Integer unitMaCode; + /** * 二维码 */ diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicPlotCoordinateDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicPlotCoordinateDTO.java index 06febae..18ab179 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicPlotCoordinateDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicPlotCoordinateDTO.java @@ -153,6 +153,6 @@ public class EpidemicPlotCoordinateDTO implements Serializable { /** * 自增编码 */ - private String plotMaCode; + private Integer plotMaCode; } diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/HouseInfoFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/HouseInfoFormDTO.java index c701e95..817093d 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/HouseInfoFormDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/HouseInfoFormDTO.java @@ -21,6 +21,8 @@ import com.elink.esua.epdc.dto.personroom.result.FamilyMemberInfoResultDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -40,21 +42,25 @@ public class HouseInfoFormDTO implements Serializable { /** * 主键 */ + @NotNull(message = "主键不能为空") private Long id; /** * 房屋类型 */ + @NotBlank(message = "房屋类型不能为空") private String roomType; /** * 房屋用途 */ + @NotBlank(message = "房屋用途不能为空") private String roomUse; /** * 居住情况 */ + @NotBlank(message = "居住情况不能为空") private String livingStatus; diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicPlotBuildingResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicPlotBuildingResultDTO.java index 5ada80d..f2aca1b 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicPlotBuildingResultDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicPlotBuildingResultDTO.java @@ -207,4 +207,9 @@ public class EpidemicPlotBuildingResultDTO implements Serializable { * 楼栋唯一编码五位数自增 */ private Integer buildingMaCode; + + /** + * 楼栋唯一编码五位数自增 + */ + private Integer plotMaCode; }