diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java index def34291..c5bcc162 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScreenPopulationController.java @@ -5,13 +5,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.DeptOption; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleDetailFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO; +import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.service.AppUserService; import com.elink.esua.epdc.service.CustomService; import org.springframework.beans.factory.annotation.Autowired; @@ -47,6 +42,48 @@ public class ApiScreenPopulationController { ValidatorUtils.validateEntity(dto); return appUserService.selectPeople(dto); } + + /** + * @Description 一人找房接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @ReportData + @PostMapping("selectHouseByPeople") + public Result> selectHouseByPeople(@RequestBody EpdcScreenHouseInfoByPeopleFormDTO dto){ + ValidatorUtils.validateEntity(dto); + return appUserService.selectHouseByPeople(dto); + } + /** + * @Description 以房找人接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @ReportData + @PostMapping("selectPeopleByHouse") + public Result> selectPeopleByHouse(@RequestBody EpdcScreenPopulationInfoByHouseFormDTO dto){ + ValidatorUtils.validateEntity(dto); + return appUserService.selectPeopleByHouse(dto); + } + + /** + * @Description 以人找人接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @ReportData + @PostMapping("selectPeopleByCurrentAddress") + public Result> selectPeopleByCurrentAddress(@RequestBody EpdcScreenResidentInfoByCurrentAddressFormDTO dto){ + ValidatorUtils.validateEntity(dto); + return appUserService.selectPeopleByCurrentAddress(dto); + } + /** * @Description 大屏找人详情接口 * @Author songyunpeng @@ -55,6 +92,7 @@ public class ApiScreenPopulationController { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @ReportData + @Deprecated @PostMapping("selectPeopleDetail") public Result selectPeopleDetail(@RequestBody EpdcScreenSelectPeopleDetailFormDTO dto){ ValidatorUtils.validateEntity(dto); @@ -70,6 +108,7 @@ public class ApiScreenPopulationController { * @Date 2020/1/28 11:50 **/ @ReportData + @Deprecated @GetMapping("getDeptTreeWithTypeKey") public Result getDeptTreeWithTypeKey() { return appUserService.getDeptTreeWithTypeKey(); @@ -84,6 +123,7 @@ public class ApiScreenPopulationController { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @ReportData + @Deprecated @PostMapping("housingUse") public Result housingUse(){ return appUserService.housingUse(); @@ -96,6 +136,7 @@ public class ApiScreenPopulationController { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @ReportData + @Deprecated @PostMapping("gridRanking") public Result> gridRanking(@RequestBody EpdcScreenGridRankingFormDTO dto){ ValidatorUtils.validateEntity(dto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 99a692ff..d19b5dfb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -483,7 +483,7 @@ public interface UserFeignClient { **/ @GetMapping(value = "app-user/usersign/addConsequentSignPoints", consumes = MediaType.APPLICATION_JSON_VALUE) Result addConsequentSignPoints(UserSignDTO userSignDTO); - + /** * @Description 大屏找人接口 * @Author songyunpeng @@ -493,17 +493,7 @@ public interface UserFeignClient { **/ @PostMapping(value = "app-user/screenPopulationInfo/selectPeople", consumes = MediaType.APPLICATION_JSON_VALUE) Result> selectPeople(EpdcScreenSelectPeopleFormDTO dto); - - - /** - * @Description 大屏找人详情接口 - * @Author songyunpeng - * @Date 2020/9/14 - * @Param [dto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - **/ - @PostMapping(value = "app-user/screenPopulationInfo/selectPeopleDetail", consumes = MediaType.APPLICATION_JSON_VALUE) - Result selectPeopleDetail(EpdcScreenSelectPeopleDetailFormDTO dto); + /** * @Description 房屋用途数据接口 * @Author songyunpeng @@ -523,4 +513,43 @@ public interface UserFeignClient { **/ @PostMapping(value = "app-user/screenPopulationInfo/gridRanking", consumes = MediaType.APPLICATION_JSON_VALUE) Result> gridRanking(@RequestBody EpdcScreenGridRankingFormDTO dto); + + + /** + * @Description 大屏找人详情接口 + * @Author songyunpeng + * @Date 2020/9/14 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping(value = "app-user/screenPopulationInfo/selectPeopleDetail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result selectPeopleDetail(EpdcScreenSelectPeopleDetailFormDTO dto); + + /** + * @Description 一人找房接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping(value = "app-user/screenPopulationInfo/selectHouseByPeople", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> selectHouseByPeople(@RequestBody EpdcScreenHouseInfoByPeopleFormDTO dto); + /** + * @Description 以房找人接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping(value = "app-user/screenPopulationInfo/selectPeopleByHouse", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> selectPeopleByHouse(@RequestBody EpdcScreenPopulationInfoByHouseFormDTO dto); + /** + * @Description 以人找人接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping(value = "app-user/screenPopulationInfo/selectPeopleByCurrentAddress", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> selectPeopleByCurrentAddress(@RequestBody EpdcScreenResidentInfoByCurrentAddressFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 5caa0d15..a00b5fa2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -243,6 +243,21 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectPeopleDetail", dto); } + @Override + public Result> selectHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectHouseByPeople", dto); + } + + @Override + public Result> selectPeopleByHouse(EpdcScreenPopulationInfoByHouseFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectPeopleByHouse", dto); + } + + @Override + public Result> selectPeopleByCurrentAddress(EpdcScreenResidentInfoByCurrentAddressFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectPeopleByCurrentAddress", dto); + } + @Override public Result housingUse() { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "housingUse"); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 2049e595..0db9f9d1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -360,4 +360,28 @@ public interface AppUserService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result> gridRanking(EpdcScreenGridRankingFormDTO dto); + /** + * @Description 以人找房 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> selectHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto); + /** + * @Description 以房找人接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> selectPeopleByHouse(EpdcScreenPopulationInfoByHouseFormDTO dto); + /** + * @Description 以人找人接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> selectPeopleByCurrentAddress(EpdcScreenResidentInfoByCurrentAddressFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 40339a85..8a75fda1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1612,4 +1612,19 @@ public class AppUserServiceImpl implements AppUserService { return userFeignClient.gridRanking(dto); } + @Override + public Result> selectHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto) { + return userFeignClient.selectHouseByPeople(dto); + } + + @Override + public Result> selectPeopleByHouse(EpdcScreenPopulationInfoByHouseFormDTO dto) { + return userFeignClient.selectPeopleByHouse(dto); + } + + @Override + public Result> selectPeopleByCurrentAddress(EpdcScreenResidentInfoByCurrentAddressFormDTO dto) { + return userFeignClient.selectPeopleByCurrentAddress(dto); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenHouseInfoByPeopleFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenHouseInfoByPeopleFormDTO.java new file mode 100644 index 00000000..3bc3c38c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenHouseInfoByPeopleFormDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +/** + * @author songyunpeng + * @Description 大屏以人找房参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenHouseInfoByPeopleFormDTO { + + /** + * 页码 + */ + @Min(value = 0, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 0, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 户主姓名 + */ + @NotBlank(message = "户主姓名不能为空") + private String houseHeadName; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenPopulationInfoByHouseFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenPopulationInfoByHouseFormDTO.java new file mode 100644 index 00000000..a7b1e212 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenPopulationInfoByHouseFormDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +/** + * @author songyunpeng + * @Description 大屏以房找人参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenPopulationInfoByHouseFormDTO { + + /** + * 页码 + */ + @Min(value = 0, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 0, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 房屋地址 + */ + @NotBlank(message = "房屋地址不能为空") + private String houseAddress; + +} 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 new file mode 100644 index 00000000..4e83e907 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java @@ -0,0 +1,34 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +/** + * @author songyunpeng + * @Description 大屏以人找人参数 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenResidentInfoByCurrentAddressFormDTO { + + /** + * 页码 + */ + @Min(value = 0, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 0, message = "页容量必须大于0") + private Integer pageSize; + + /** + * 当前居住地址 + */ + @NotBlank(message = "居住地址不能为空") + private String currentAddress; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenHouseInfoByPeopleResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenHouseInfoByPeopleResultDTO.java new file mode 100644 index 00000000..e8f435d8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenHouseInfoByPeopleResultDTO.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏以人找房结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenHouseInfoByPeopleResultDTO { + /** + * ID + */ + private String populationId; + /** + * 身份标识 + */ + private String identityFlag; + /** + * 户主姓名 + */ + private String houseHeadName; + /** + * 网格名称 + */ + private String gridName; + /** + * 房屋地址 + */ + private String houseAddress; + /** + * 户主联系电话 + */ + private String houseHeadPhone; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenPopulationInfoByHouseResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenPopulationInfoByHouseResultDTO.java new file mode 100644 index 00000000..a4ff1ed9 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenPopulationInfoByHouseResultDTO.java @@ -0,0 +1,37 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏以房找人结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenPopulationInfoByHouseResultDTO { + /** + * ID + */ + private String populationId; + /** + * 身份标识 + */ + private String identityFlag; + /** + * 户主姓名 + */ + private String houseHeadName; + /** + * 网格名称 + */ + private String gridName; + /** + * 房屋地址 + */ + private String houseAddress; + /** + * 户主联系电话 + */ + private String houseHeadPhone; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenResidentInfoByCurrentAddressResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenResidentInfoByCurrentAddressResultDTO.java new file mode 100644 index 00000000..a90bf02a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcScreenResidentInfoByCurrentAddressResultDTO.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +/** + * @author songyunpeng + * @Description 大屏以人找人结果 + * @create 2020-09-14 + */ +@Data +public class EpdcScreenResidentInfoByCurrentAddressResultDTO { + /** + * ID + */ + private String populationId; + /** + * 身份标识 + */ + private String identityFlag; + + /** + * 居住人姓名 + */ + private String residentName; + /** + * 当前居住地址 + */ + private String currentAddress; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/FamilyMember.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/FamilyMember.java index 56b53986..67d009fc 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/FamilyMember.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/FamilyMember.java @@ -17,5 +17,9 @@ public class FamilyMember { * 关系 */ private String relation; + /** + * 居住地 + */ + private String currentAddress; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java index d9e44d3b..50a3980d 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcScreenPopulationInformationController.java @@ -19,13 +19,8 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleDetailFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO; +import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.service.PopulationInformationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -46,19 +41,42 @@ public class EpdcScreenPopulationInformationController { @Autowired private PopulationInformationService populationInformationService; - + /** + * @Description 一人找房接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping("selectHouseByPeople") + public Result> selectHouseByPeople(@RequestBody EpdcScreenHouseInfoByPeopleFormDTO dto){ + return new Result>().ok(populationInformationService.selectHouseByPeople(dto)); + } + /** + * @Description 以房找人接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping("selectPeopleByHouse") + public Result> selectPeopleByHouse(@RequestBody EpdcScreenPopulationInfoByHouseFormDTO dto){ + return new Result>().ok(populationInformationService.selectPeopleByHouse(dto)); + } /** - * @Description 大屏找人接口 + * @Description 以人找人接口 * @Author songyunpeng - * @Date 2020/9/14 - * @Param [epdcScreenSelectPeopleFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - @PostMapping("selectPeople") - public Result> selectPeople(@RequestBody EpdcScreenSelectPeopleFormDTO dto){ - return new Result>().ok(populationInformationService.selectPeople(dto)); + @PostMapping("selectPeopleByCurrentAddress") + public Result> selectPeopleByCurrentAddress(@RequestBody EpdcScreenResidentInfoByCurrentAddressFormDTO dto){ + return new Result>().ok(populationInformationService.selectPeopleByCurrentAddress(dto)); } + + /** * @Description 大屏找人详情接口 * @Author songyunpeng @@ -70,6 +88,19 @@ public class EpdcScreenPopulationInformationController { public Result selectPeopleDetail(@RequestBody EpdcScreenSelectPeopleDetailFormDTO dto){ return populationInformationService.selectPeopleDetail(dto); } + + /** + * @Description 大屏找人接口 + * @Author songyunpeng + * @Date 2020/9/14 + * @Param [epdcScreenSelectPeopleFormDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping("selectPeople") + @Deprecated + public Result> selectPeople(@RequestBody EpdcScreenSelectPeopleFormDTO dto){ + return new Result>().ok(populationInformationService.selectPeople(dto)); + } /** * @Description 房屋用途数据接口 * @Author songyunpeng @@ -78,6 +109,7 @@ public class EpdcScreenPopulationInformationController { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @PostMapping("housingUse") + @Deprecated public Result housingUse(){ return populationInformationService.housingUse(); } @@ -89,6 +121,7 @@ public class EpdcScreenPopulationInformationController { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @PostMapping("gridRanking") + @Deprecated public Result> gridRanking(@RequestBody EpdcScreenGridRankingFormDTO dto){ return new Result>().ok(populationInformationService.gridRanking(dto)); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java index 9ae2026f..47aed26b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PopulationInformationDao.java @@ -20,11 +20,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO; import com.elink.esua.epdc.dto.PopulationInformationDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO; +import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.entity.PopulationInformationEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -144,4 +141,52 @@ public interface PopulationInformationDao extends BaseDao **/ Integer selectCountListGridRanking(EpdcScreenGridRankingFormDTO dto); + /** + * @Description 一人找房接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return java.util.List + **/ + List selectHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto); + /** + * @Description 一人找房接口 - count + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return java.util.List + **/ + Integer selectCountHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto); + /** + * @Description 以房找人 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return java.util.List + **/ + List selectPeopleByHouse(EpdcScreenPopulationInfoByHouseFormDTO dto); + /** + * @Description 以房找人 - count + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return java.util.List + **/ + Integer selectCountPeopleByHouse(EpdcScreenPopulationInfoByHouseFormDTO dto); + /** + * @Description 以人找人 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return java.util.List + **/ + List selectPeopleByCurrentAddress(EpdcScreenResidentInfoByCurrentAddressFormDTO dto); + /** + * @Description 以人找人 - count + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return java.lang.Integer + **/ + Integer selectCountPeopleByCurrentAddress(EpdcScreenResidentInfoByCurrentAddressFormDTO dto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java index b2b9ae8e..69624db3 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PopulationInformationService.java @@ -22,13 +22,8 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO; import com.elink.esua.epdc.dto.PopulationInformationDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleDetailFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenGridRankingResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenHouseUseResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleDetailResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcScreenSelectPeopleResultDTO; +import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.entity.PopulationInformationEntity; import java.util.List; @@ -198,4 +193,28 @@ public interface PopulationInformationService extends BaseService **/ PageData gridRanking(EpdcScreenGridRankingFormDTO dto); + /** + * @Description 一人找房接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.page.PageData + **/ + PageData selectHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto); + /** + * @Description 以房找人接口 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.page.PageData + **/ + PageData selectPeopleByHouse(EpdcScreenPopulationInfoByHouseFormDTO dto); + /** + * @Description 一人找人 + * @Author songyunpeng + * @Date 2020/9/19 + * @Param [dto] + * @return com.elink.esua.epdc.commons.tools.page.PageData + **/ + PageData selectPeopleByCurrentAddress(EpdcScreenResidentInfoByCurrentAddressFormDTO dto); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java index 81659e8f..f22a84e1 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java @@ -35,9 +35,7 @@ import com.elink.esua.epdc.dto.BaseResidentInformationExportDto; import com.elink.esua.epdc.dto.HousingInformationDTO; import com.elink.esua.epdc.dto.PopulationInfoOverviewDTO; import com.elink.esua.epdc.dto.PopulationInformationDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenGridRankingFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleDetailFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcScreenSelectPeopleFormDTO; +import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.entity.HouseResidentEntity; import com.elink.esua.epdc.entity.HousingInformationEntity; @@ -55,7 +53,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; /** - * 人口信息表 + * 人口信息表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-08-19 @@ -90,8 +88,8 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -110,19 +108,19 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl params = new HashMap<>(); - params.put("RESIDENT_ID",infoByIdentityNo.getId()); + if (infoByIdentityNo != null) { + Map params = new HashMap<>(); + params.put("RESIDENT_ID", infoByIdentityNo.getId()); List houseResidentEntities = houseResidentDao.selectByMap(params); - if(houseResidentEntities.size()>0){ + if (houseResidentEntities.size() > 0) { //2.此人有房屋信息，且为第一次提交则此时提示前端 - if("0".equals(dto.getIsSubmit())){ + if ("0".equals(dto.getIsSubmit())) { StringBuffer sb = new StringBuffer(); for (HouseResidentEntity houseResidentEntity : houseResidentEntities) { HousingInformationEntity housingInformationEntity = housingInformationService.selectById(houseResidentEntity.getHouseId()); sb.append(",\"").append(housingInformationEntity.getHouseAddress()).append("\""); } - String result ="您在地址为"+sb.substring(1)+"下已有房产信息，点击确认则新增此房产且更新居民信息！"; + String result = "您在地址为" + sb.substring(1) + "下已有房产信息，点击确认则新增此房产且更新居民信息！"; return new Result().ok(result.substring(1)); } //2.第二次提交，则更新户主信息且新增关联信息 @@ -153,27 +151,27 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl params = new HashMap<>(); - params.put("RESIDENT_ID",infoByIdentityNo.getId()); + Map params = new HashMap<>(); + params.put("RESIDENT_ID", infoByIdentityNo.getId()); List houseResidentEntities = houseResidentDao.selectByMap(params); - if(houseResidentEntities.size()>0){ + if (houseResidentEntities.size() > 0) { //2.此人有房屋信息，且为第一次提交则此时提示前端 - if("0".equals(dto.getIsSubmit())){ + if ("0".equals(dto.getIsSubmit())) { StringBuffer sb = new StringBuffer(); for (HouseResidentEntity houseResidentEntity : houseResidentEntities) { HousingInformationEntity housingInformationEntity = housingInformationService.selectById(houseResidentEntity.getHouseId()); sb.append(",\"").append(housingInformationEntity.getHouseAddress()).append("\""); } - String result ="您在地址为"+sb.substring(1)+"下已有房产信息，点击确认则新增此房产且更新居民信息！"; + String result = "您在地址为" + sb.substring(1) + "下已有房产信息，点击确认则新增此房产且更新居民信息！"; return new Result().ok(result.substring(1)); } //2.第二次提交，则更新户主信息 PopulationInformationEntity entity = ConvertUtils.sourceToTarget(dto, PopulationInformationEntity.class); entity.setId(infoByIdentityNo.getId()); //置空其他选择信息-防止导出时数据出错 - if("0".equals(dto.getPoliticsStatus())){ + if ("0".equals(dto.getPoliticsStatus())) { //如果表单选择的是群众，则清空入党时间和组织关系所在地 this.setJionTimeToNull(entity.getId()); entity.setJoinTime(null); entity.setOrganizationalRelationshipLocation(""); } - if("0".equals(dto.getEmploymentStatus())){ + if ("0".equals(dto.getEmploymentStatus())) { //如果表单选择的是在岗，则清空失业原因，再就业优惠政，失业登记和失业登记时间 entity.setUnemploymentReason(""); entity.setReemploymentPermit(""); @@ -235,11 +233,11 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl list = baseDao.selectListPeople(dto); - return new PageData<>(list,baseDao.selectCountListPeople(dto)); + return new PageData<>(list, baseDao.selectCountListPeople(dto)); } @Override public Result selectPeopleDetail(EpdcScreenSelectPeopleDetailFormDTO dto) { EpdcScreenSelectPeopleDetailResultDTO epdcScreenSelectPeopleDetailResultDTO = new EpdcScreenSelectPeopleDetailResultDTO(); //根据身份标识寻找对应人员信息 - if(PopulationIdentify.HOUSE_HEAD.equals(dto.getIdentifyFlag())) { - if(StringUtils.isBlank(dto.getPopulationId())){ + if (PopulationIdentify.HOUSE_HEAD.equals(dto.getIdentifyFlag())) { + if (StringUtils.isBlank(dto.getPopulationId())) { return new Result().error("查询产权人信息失败：人口ID为空"); } - //如果是户主，人口信息从人口表拿 - PopulationInformationEntity populationInformationEntity = this.selectById(dto.getPopulationId()); - epdcScreenSelectPeopleDetailResultDTO.setName(populationInformationEntity.getResidentsName()); - epdcScreenSelectPeopleDetailResultDTO.setSex("0".equals(populationInformationEntity.getResidentsSex())?"女":"男"); - if(IdentityNoUtils.IdentityNoVerification(populationInformationEntity.getResidentsIdentityNo())==null){ - epdcScreenSelectPeopleDetailResultDTO.setAge(IdentityNoUtils.getAge(populationInformationEntity.getResidentsIdentityNo())+""); - }else { - epdcScreenSelectPeopleDetailResultDTO.setAge(""); - } - epdcScreenSelectPeopleDetailResultDTO.setPhone(populationInformationEntity.getResidentsPhone()); - //房屋信息 - List housingInformationDTOList = housingInformationService.getHouseInfoByHouseHeadID(dto.getPopulationId()); - List housingInfoList = ConvertUtils.sourceToTarget(housingInformationDTOList, HousingInfo.class); - housingInfoList.forEach(housingInfo -> { - setHouseUse(housingInfo.getHouseUse(),housingInfo); - }); - epdcScreenSelectPeopleDetailResultDTO.setHousingInfo(housingInfoList); - //居住人信息 - List familyMemberList = new ArrayList<>(); - Set houseHeadIds = new HashSet<>(1); - houseHeadIds.add(dto.getPopulationId()); - List baseResidentInformationExportDtos = housingInformationService.selectBaseResidentInformationExcelList(houseHeadIds); - FamilyMember familyMember = new FamilyMember(); - baseResidentInformationExportDtos.forEach(a -> { - familyMember.setName(a.getResidentsName()); - switch (a.getHouseHeadRelation()){ - case HouseHeadRelationConstant.CHILDREN : - familyMember.setRelation("子女"); - break; - case HouseHeadRelationConstant.HUSBAND_AND_WIFE : - familyMember.setRelation("夫妻"); - break; - case HouseHeadRelationConstant.PARENT : - familyMember.setRelation("父母"); - break; - case HouseHeadRelationConstant.OTHER : - familyMember.setRelation("其他"); - break; - default: - familyMember.setRelation(""); - break; - } - familyMemberList.add(familyMember); - }); - epdcScreenSelectPeopleDetailResultDTO.setFamilyMember(familyMemberList); + //根据户主ID组装信息 + setHouseHeadInfo(dto.getPopulationId(),epdcScreenSelectPeopleDetailResultDTO); return new Result().ok(epdcScreenSelectPeopleDetailResultDTO); - } else if(PopulationIdentify.HOUSE_RESIDENT.equals(dto.getIdentifyFlag())) { - if(StringUtils.isBlank(dto.getPopulationId())){ - return new Result().error("查询产权人信息失败：人口ID为空"); - } - //居住人，人口信息从人口表拿 - PopulationInformationEntity populationInformationEntity = this.selectById(dto.getPopulationId()); - if(populationInformationEntity==null){ - return new Result().error("未查找到此人信息！"); + } else if (PopulationIdentify.HOUSE_RESIDENT.equals(dto.getIdentifyFlag())) { + if (StringUtils.isBlank(dto.getPopulationId())) { + return new Result().error("查询居住人信息失败：人口ID为空"); } - epdcScreenSelectPeopleDetailResultDTO.setName(populationInformationEntity.getResidentsName()); - epdcScreenSelectPeopleDetailResultDTO.setSex("0".equals(populationInformationEntity.getResidentsSex())?"女":"男"); - epdcScreenSelectPeopleDetailResultDTO.setAge(""); - epdcScreenSelectPeopleDetailResultDTO.setPhone(""); - //房屋信息 - 继承户主的房屋信息 - //查询该居住人的户主ID - Map params = new HashMap<>(); - params.put("RESIDENT_ID",dto.getPopulationId()); - params.put("IS_HOUSE_HEAD","0"); + //查找居住人对应的户主细腻 + Map params = new HashMap<>(); + params.put("RESIDENT_ID", dto.getPopulationId()); List houseResidentEntityList = houseResidentDao.selectByMap(params); - String houseHeadId = houseResidentEntityList.get(0).getHouseHeadId(); - //房屋信息 - List housingInformationDTOList = housingInformationService.getHouseInfoByHouseHeadID(houseHeadId); - List housingInfoList = ConvertUtils.sourceToTarget(housingInformationDTOList, HousingInfo.class); - housingInfoList.forEach(housingInfo -> { - setHouseUse(housingInfo.getHouseUse(),housingInfo); - }); - epdcScreenSelectPeopleDetailResultDTO.setHousingInfo(housingInfoList); + if(houseResidentEntityList==null || houseResidentEntityList.size()==0){ + return new Result().error("根据居住人查询户主失败"); + } + HouseResidentEntity houseResidentEntity = houseResidentEntityList.get(0); + //根据户主ID组装信息 + setHouseHeadInfo(houseResidentEntity.getHouseHeadId(),epdcScreenSelectPeopleDetailResultDTO); return new Result().ok(epdcScreenSelectPeopleDetailResultDTO); } return new Result().error("查询错误：身份标识参数无法匹配"); } + private void setHouseHeadInfo(String houseHeadId,EpdcScreenSelectPeopleDetailResultDTO epdcScreenSelectPeopleDetailResultDTO ){ + //如果是户主，人口信息从人口表拿 + PopulationInformationEntity populationInformationEntity = this.selectById(houseHeadId); + epdcScreenSelectPeopleDetailResultDTO.setName(populationInformationEntity.getResidentsName()); + epdcScreenSelectPeopleDetailResultDTO.setSex("0".equals(populationInformationEntity.getResidentsSex()) ? "女" : "男"); + if (IdentityNoUtils.IdentityNoVerification(populationInformationEntity.getResidentsIdentityNo()) == null) { + epdcScreenSelectPeopleDetailResultDTO.setAge(IdentityNoUtils.getAge(populationInformationEntity.getResidentsIdentityNo()) + ""); + } else { + epdcScreenSelectPeopleDetailResultDTO.setAge(""); + } + epdcScreenSelectPeopleDetailResultDTO.setPhone(populationInformationEntity.getResidentsPhone()); + //房屋信息 + List housingInformationDTOList = housingInformationService.getHouseInfoByHouseHeadID(houseHeadId); + List housingInfoList = ConvertUtils.sourceToTarget(housingInformationDTOList, HousingInfo.class); + housingInfoList.forEach(housingInfo -> { + setHouseUse(housingInfo.getHouseUse(), housingInfo); + }); + epdcScreenSelectPeopleDetailResultDTO.setHousingInfo(housingInfoList); + //居住人信息 + List familyMemberList = new ArrayList<>(); + Set houseHeadIds = new HashSet<>(1); + houseHeadIds.add(houseHeadId); + List baseResidentInformationExportDtos = housingInformationService.selectBaseResidentInformationExcelList(houseHeadIds); + FamilyMember familyMember = new FamilyMember(); + baseResidentInformationExportDtos.forEach(a -> { + familyMember.setName(a.getResidentsName()); + familyMember.setCurrentAddress(a.getCurrentAddress()); + switch (a.getHouseHeadRelation()) { + case HouseHeadRelationConstant.CHILDREN: + familyMember.setRelation("子女"); + break; + case HouseHeadRelationConstant.HUSBAND_AND_WIFE: + familyMember.setRelation("夫妻"); + break; + case HouseHeadRelationConstant.PARENT: + familyMember.setRelation("父母"); + break; + case HouseHeadRelationConstant.OTHER: + familyMember.setRelation("其他"); + break; + default: + familyMember.setRelation(""); + break; + } + familyMemberList.add(familyMember); + }); + epdcScreenSelectPeopleDetailResultDTO.setFamilyMember(familyMemberList); + } + @Override public Result housingUse() { EpdcScreenHouseUseResultDTO epdcScreenHouseUseResultDTO = baseDao.selectHouseUseDataForScreen(); @@ -424,15 +415,38 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl(list, baseDao.selectCountListGridRanking(dto)); } - private void setHouseUse(String houseUse,HousingInfo housingInfo){ - switch (houseUse){ - case HouseUseConstant.RENT : + @Override + public PageData selectHouseByPeople(EpdcScreenHouseInfoByPeopleFormDTO dto) { + int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); + dto.setPageIndex(pageIndex); + List list = baseDao.selectHouseByPeople(dto); + return new PageData<>(list, baseDao.selectCountHouseByPeople(dto)); } + + @Override + public PageData selectPeopleByHouse(EpdcScreenPopulationInfoByHouseFormDTO dto) { + int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); + dto.setPageIndex(pageIndex); + List list = baseDao.selectPeopleByHouse(dto); + return new PageData<>(list, baseDao.selectCountPeopleByHouse(dto)); + } + + @Override + public PageData selectPeopleByCurrentAddress(EpdcScreenResidentInfoByCurrentAddressFormDTO dto) { + int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); + dto.setPageIndex(pageIndex); + List list = baseDao.selectPeopleByCurrentAddress(dto); + return new PageData<>(list, baseDao.selectCountPeopleByCurrentAddress(dto)); + } + + private void setHouseUse(String houseUse, HousingInfo housingInfo) { + switch (houseUse) { + case HouseUseConstant.RENT: housingInfo.setHouseUse("租赁"); break; - case HouseUseConstant.SINCE_THE_LIVING : + case HouseUseConstant.SINCE_THE_LIVING: housingInfo.setHouseUse("自住"); break; - case HouseUseConstant.BUSINESS : + case HouseUseConstant.BUSINESS: housingInfo.setHouseUse("经营"); break; default: 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 9b81753e..adaa37b9 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 @@ -385,6 +385,101 @@ order by total desc)a + + + + + + \ No newline at end of file