From 2eea3290641657d2ee13edd90d27f8b2ec01c209 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期六, 08 五月 2021 18:23:48 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
index a82a552..e792c30 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngVillageService.java
@@ -2,6 +2,7 @@
 
 import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
 import com.panzhihua.common.model.vos.community.ComMngVillageVO;
 
 import java.util.List;
@@ -16,25 +17,34 @@
      * @param comMngVillageVO 实有房屋
      * @return 新增结果
      */
-    R addComMngVillage(ComMngVillageVO comMngVillageVO);
+    R addComActVillage(ComMngVillageVO comMngVillageVO);
 
     /**
      * 查询实有房屋
      * @param comMngVillageVO 登录人的经纬度、或者指定区域的社区
      * @return 社区集合
      */
-    R listComMngVillage(ComMngVillageVO comMngVillageVO);
+    R listComActVillage(ComMngVillageVO comMngVillageVO);
+
     /**
      * 分页查询实有房屋
      * @param pageComMngVillageDTO 查询参数
      * @return 分页集合
      */
-    R pageComMngVillage(PageComMngVillageDTO pageComMngVillageDTO);
+    R pageComActVillage(PageComMngVillageDTO pageComMngVillageDTO);
 
     /**
      * 删除实有房屋
      * @param Ids 实有房屋ids
      * @return 删除结果
      */
-    R delecComMngVillage(List<Long> Ids);
+    R delecComActVillage(List<Long> Ids);
+
+    /**
+     * 批量导入实有房屋
+     * @param list
+     * @param communityId
+     * @return
+     */
+    R listSaveVillage(List<ComMngVillageServeExcelVO> list, Long communityId);
 }

--
Gitblit v1.7.1