Merge branch 'test' into 'master'

罗元桥

2021-08-05 cc1098fc00a50cb1591d182f04bc37066ff0a9e2

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java

@@ -4,9 +4,12 @@
import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import org.springframework.web.bind.annotation.PostMapping;

import java.util.List;

@@ -28,6 +31,14 @@
     * @return 社区集合
     */
    R listComActVillage(ComMngVillageVO comMngVillageVO);

    /**
     * 根据房屋id查询实有房屋
     *
     * @param villageId 查询条件
     * @return 查询结果
     */
    ComMngVillageDO getVillageById(Long villageId);

    /**
     * 分页查询实有房屋
@@ -87,4 +98,10 @@
     */
    R getGridVillageBuildingList(Long villageId);

    R delGridVillage(List<Long> villageIds);

    R getGridVillageStatistics();

    R getGridVillageListExport(ComMngVillageListExportAdminDTO villageListAppDTO);

}