From 4e8338d3e2b30e360f028c9f2354462ca817a989 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 21 七月 2021 17:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index e801bf7..e18060f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1667,6 +1667,15 @@
     R listVillage(ComMngVillageVO comMngVillageVO);
 
     /**
+     * 根据房屋id查询实有房屋
+     *
+     * @param villageId 查询条件
+     * @return 查询结果
+     */
+    @PostMapping("/getVillageById")
+    R getVillageById(@RequestParam(value = "villageId")Long villageId);
+
+    /**
      * 批量导入实有房屋
      *
      * @param list        实有房屋数据
@@ -1762,6 +1771,15 @@
     R getPopulationLists(@RequestBody List<Long> Ids);
 
     /**
+     * 根据小区id查询实有人口
+     *
+     * @param villageId 小区id
+     * @return 查询结果
+     */
+    @PostMapping("/common/data/population/getListByVillageId")
+    R getPopulationListByVillageId(@RequestParam("villageId") Long villageId);
+
+    /**
      * 创建调查问卷
      *
      * @param questnaireVO

--
Gitblit v1.7.1