Merge branch 'yantai_zhengwu_master'

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;
+
 }

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<com.epmet.commons.tools.page.PageData < com.epmet.dto.result.HouseLangchaoListResultDTO>>
+     * @Author: lichao
+     * @Date: 2023/6/30 09:49
+     */
+    @PostMapping("houseListForLangchao")
+    public Result<PageData<HouseLangchaoListResultDTO>>houseListForLangchao(@RequestBody HouseListLangchaoFormDTO formDTO) {
+        return new Result<PageData<HouseLangchaoListResultDTO>>().ok(houseService.houseListForLangchao(formDTO));
+    }
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java

@@ -213,4 +213,6 @@ public interface HouseService {
      * @return
      */
     PageData<GroupRentHouseResultDTO> groupRentHouseList(GroupRentHouseFormDTO formDTO);
+
+    PageData<HouseLangchaoListResultDTO> houseListForLangchao(HouseListLangchaoFormDTO formDTO);
 }

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<GroupRentHouseResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());
     }
+
+    @Override
+    public PageData<HouseLangchaoListResultDTO> 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<HouseLangchaoListResultDTO> list = icHouseDao.searchHouseForLangchao(formDTO);
+        PageInfo<HouseLangchaoListResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list,pageInfo.getTotal());
+    }
 }

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;
+
 }

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<com.epmet.commons.tools.page.PageData < com.epmet.dto.result.HouseLangchaoListResultDTO>>
+     * @Author: lichao
+     * @Date: 2023/6/30 09:49
+     */
+    @PostMapping("resiListForLangchao")
+    public Result<PageData<ResiLangchaoListResultDTO>>resiListForLangchao(@RequestBody ResiListLangchaoFormDTO formDTO) {
+        return new Result<PageData<ResiLangchaoListResultDTO>>().ok(icResiUserService.resiListForLangchao(formDTO));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -604,4 +604,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
                                                             String codeType,String code);
 
     void exportResiForLangchao(HttpServletResponse response) throws  Exception;
+
+    PageData<ResiLangchaoListResultDTO> resiListForLangchao(ResiListLangchaoFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -4248,4 +4248,25 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         }
 
     }
+
+    @Override
+    public PageData<ResiLangchaoListResultDTO> resiListForLangchao(ResiListLangchaoFormDTO formDTO) {
+
+        // 获取agency 查看是否
+        Result<CustomerAgencyDTO> agency = govOrgOpenFeignClient.getAgencyById(epmetUserRemoteService.getLoginUserDetails().getAgencyId());
+        if (!agency.getData().getLevel().equals("community")){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "只有社区才可以导出", "只有社区才可以导出");
+        }
+        Result<CustomerAgencyDTO> 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<ResiLangchaoListResultDTO> list = icResiUserDao.searchResiForLangchao(formDTO);
+        PageInfo<ResiLangchaoListResultDTO> pageData = new PageInfo<>(list);
+
+        return new PageData<>(list,pageData.getTotal());
+    }
 }