diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java index 4e83e907..3e682d30 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java @@ -28,7 +28,10 @@ public class EpdcScreenResidentInfoByCurrentAddressFormDTO { /** * 当前居住地址 */ - @NotBlank(message = "居住地址不能为空") private String currentAddress; + /** + * 居住人姓名 + */ + private String residentName; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml index e7c14ecc..b83f43cd 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml @@ -475,6 +475,9 @@ and t.CURRENT_ADDRESS like concat('%', #{currentAddress}, '%') + + and t.RESIDENTS_NAME like concat('%', #{residentName}, '%') + group by t.ID LIMIT #{pageIndex},#{pageSize} @@ -488,6 +491,9 @@ and CURRENT_ADDRESS like concat('%', #{currentAddress}, '%') + + and t.RESIDENTS_NAME like concat('%', #{residentName}, '%') +