Merge remote-tracking branch 'remotes/origin/dev_optimize' into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java

@@ -31,6 +31,7 @@ import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.form.IcHouseListFormDTO;
 import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.IcNeighborHoodListFormDTO;
+import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.entity.IcBuildingEntity;
 import com.epmet.excel.IcNeighborHoodExcel;
 import com.epmet.service.BuildingService;
@@ -77,7 +78,7 @@ public class NeighborHoodController {
 
 
     @PostMapping("neighborhoodlist")
-    public Result<IcHouseListFormDTO> neighborhoodlist(@RequestBody IcNeighborHoodListFormDTO formDTO){
+    public Result<IcNeighborHoodResultDTO> neighborhoodlist(@RequestBody IcNeighborHoodListFormDTO formDTO){
         //效验数据
         ValidatorUtils.validateEntity(formDTO);
         return new Result().ok(neighborHoodService.listNeighborhood(formDTO));

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

@@ -18,9 +18,10 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.IcHouseListFormDTO;
+import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.IcNeighborHoodListFormDTO;
+import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.excel.IcNeighborHoodExcel;
 
 import javax.servlet.http.HttpServletResponse;
@@ -36,7 +37,7 @@ public interface NeighborHoodService{
 
     void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO);
 
-    PageData<IcHouseListFormDTO> listNeighborhood(IcNeighborHoodListFormDTO formDTO);
+    PageData<IcNeighborHoodResultDTO> listNeighborhood(IcNeighborHoodListFormDTO formDTO);
 
     void updateNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO);
 

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

@@ -15,9 +15,10 @@ import com.epmet.dao.*;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcNeighborHoodPropertyDTO;
-import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.IcHouseListFormDTO;
+import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.IcNeighborHoodListFormDTO;
+import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.entity.*;
 import com.epmet.excel.IcNeighborHoodExcel;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -109,7 +110,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
      * @return
      */
     @Override
-    public PageData<IcHouseListFormDTO> listNeighborhood(IcNeighborHoodListFormDTO formDTO) {
+    public PageData<IcNeighborHoodResultDTO> listNeighborhood(IcNeighborHoodListFormDTO formDTO) {
         if(NeighborhoodConstant.GRID.equals(formDTO.getLevel())){
             //根据网格过滤
             formDTO.setGridId(formDTO.getId());
@@ -117,7 +118,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
             //根据组织过滤
             formDTO.setAgencyId(formDTO.getId());
         }
-        PageInfo<IcHouseListFormDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO));
+        PageInfo<IcNeighborHoodResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO));
         return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
     }