From 868ceec813ab2b1e66c99a970d71c5d258bc1323 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 16 Jun 2022 09:46:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=B6=E5=BA=AD?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/personroom/form/HouseInfoFormDTO.java | 6 ++++++ 1 file changed, 6 insertions(+) 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; From 266d3285ab42c8ed0b442a89b13367f155c3ea17 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 16 Jun 2022 14:44:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/personroom/EpidemicPlotCoordinateDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 0ca4fb4ea3d7cf6b6418e4f6f2218362cd22e162 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 16 Jun 2022 16:07:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java | 5 +++++ 1 file changed, 5 insertions(+) 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; + /** * 二维码 */ From a890b4eaea247f06f33552cb88a9df2388955c96 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 17 Jun 2022 10:07:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=93=92=E5=93=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/personroom/result/EpidemicPlotBuildingResultDTO.java | 5 +++++ 1 file changed, 5 insertions(+) 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; }