From c4d6c6cc7f6a2342cc32e7f67f6f6eeb76a97ac1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 30 三月 2021 19:53:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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 d0fd236..c0d8d7a 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
@@ -341,6 +341,16 @@
R listSubordinatebuilding(@RequestParam("houseCode") String houseCode);
/**
+ * 实有单位归属地
+ *
+ * @param comMngRealCompanyBelongsDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/belongs")
+ R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
+
+
+ /**
* 添加同级地址
*
* @param comMngStructHouseVO 同级参数
@@ -1560,8 +1570,20 @@
@PostMapping("/village/import")
R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入实有人口
+ *
+ * @param list
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/common/data/population/import")
+ R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
/**
* 分页查询实有人口
+ *
* @param comMngPopulationVO 查询参数
* @return 分页集合
*/
@@ -1570,6 +1592,7 @@
/**
* 根据id实有人口详细信息
+ *
* @param populationId 实有人口id
* @return 实有人口详细信息
*/
@@ -1578,9 +1601,11 @@
/**
* 根据id修改实有人口标签列表
+ *
* @param populationTagDTO 请求参数
* @return 修改结果
*/
@PostMapping("/common/data/population/editTag")
R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
+
}
--
Gitblit v1.7.1