diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseListLangchaoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseListLangchaoFormDTO.java index 92e3526a57..c264624743 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseListLangchaoFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseListLangchaoFormDTO.java @@ -21,4 +21,8 @@ public class HouseListLangchaoFormDTO extends PageFormDTO { // 街道名称 private String streetName; + private Integer pageSize; + + private Integer pageNo; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index d3b2501fb7..4470987f5a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -737,5 +737,16 @@ public class HouseController implements ResultDataResolver { epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); } + /** + * @Description: 烟台需求-浪潮原始数据分页列表 + * @param formDTO: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/6/30 09:49 + */ + @PostMapping("houseListForLangchao") + public Result>houseListForLangchao(@RequestBody HouseListLangchaoFormDTO formDTO) { + return new Result>().ok(houseService.houseListForLangchao(formDTO)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index b66f31b324..06b7fce858 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -213,4 +213,6 @@ public interface HouseService { * @return */ PageData groupRentHouseList(GroupRentHouseFormDTO formDTO); + + PageData houseListForLangchao(HouseListLangchaoFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 59220d0949..fcd33c9684 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -1573,4 +1573,24 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } + + @Override + public PageData houseListForLangchao(HouseListLangchaoFormDTO formDTO) { + + // 获取agency 查看是否 + CustomerAgencyDTO agency = agencyservice.getAgencyById(epmetUserRemoteService.getLoginUserDetails().getAgencyId()); + if (!agency.getLevel().equals("community")){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "只有社区才可以导出", "只有社区才可以导出"); + } + CustomerAgencyDTO agencyPid = agencyservice.getAgencyById(agency.getPid()); + formDTO.setStreetName(agencyPid.getOrganizationName()); + formDTO.setCommunityName(agency.getOrganizationName()); +// formDTO.setStreetName("白石街道"); +// formDTO.setCommunityName("丽都社区"); + + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = icHouseDao.searchHouseForLangchao(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list,pageInfo.getTotal()); + } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiListLangchaoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiListLangchaoFormDTO.java index 3a65ed4d88..3f4d2c3df2 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiListLangchaoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiListLangchaoFormDTO.java @@ -21,4 +21,8 @@ public class ResiListLangchaoFormDTO extends PageFormDTO { // 街道名称 private String streetName; + private Integer pageNo; + + private Integer pageSize; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 39933f8cc6..db0529770f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1650,4 +1650,17 @@ public class IcResiUserController implements ResultDataResolver { epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); } + + /** + * @Description: 烟台需求-浪潮原始数据分页列表 + * @param formDTO: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/6/30 09:49 + */ + @PostMapping("resiListForLangchao") + public Result>resiListForLangchao(@RequestBody ResiListLangchaoFormDTO formDTO) { + return new Result>().ok(icResiUserService.resiListForLangchao(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 3e18ece83c..aa323aa51e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -604,4 +604,6 @@ public interface IcResiUserService extends BaseService { String codeType,String code); void exportResiForLangchao(HttpServletResponse response) throws Exception; + + PageData resiListForLangchao(ResiListLangchaoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 83dc45d08b..d17d25731e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -4248,4 +4248,25 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resiListForLangchao(ResiListLangchaoFormDTO formDTO) { + + // 获取agency 查看是否 + Result agency = govOrgOpenFeignClient.getAgencyById(epmetUserRemoteService.getLoginUserDetails().getAgencyId()); + if (!agency.getData().getLevel().equals("community")){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "只有社区才可以导出", "只有社区才可以导出"); + } + Result agencyPid = govOrgOpenFeignClient.getAgencyById(agency.getData().getPid()); + formDTO.setStreetName(agencyPid.getData().getOrganizationName()); + formDTO.setCommunityName(agency.getData().getOrganizationName()); +// formDTO.setStreetName("白石街道"); +// formDTO.setCommunityName("丽都社区"); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + + List list = icResiUserDao.searchResiForLangchao(formDTO); + PageInfo pageData = new PageInfo<>(list); + + return new PageData<>(list,pageData.getTotal()); + } }