From 0edab788f512d3c269c6b5caa62682dc1ef396f4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 30 三月 2021 18:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 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 a2a1455..453e622 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
+ */
+ @GetMapping("/common/data/company/belongs")
+ R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
+
+
+ /**
* 添加同级地址
*
* @param comMngStructHouseVO 同级参数
@@ -1338,15 +1348,6 @@
R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
/**
- * 分页查询实有人口
- * @param comMngPopulationVO 查询参数
- * @return 分页集合
- */
- @PostMapping("/common/data/population/page")
- R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
-
-
- /**
* 社区后台实有单位管理列表
*
* @param pageComMngRealCompanyDTO
@@ -1572,10 +1573,39 @@
/**
* 批量导入实有人口
+ *
* @param list
* @param communityId
* @return
*/
@PostMapping("/common/data/population/import")
- R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,@RequestParam(value = "communityId") Long communityId);
+ R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 分页查询实有人口
+ *
+ * @param comMngPopulationVO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/page")
+ R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
+
+ /**
+ * 根据id实有人口详细信息
+ *
+ * @param populationId 实有人口id
+ * @return 实有人口详细信息
+ */
+ @PostMapping("/common/data/population/detail")
+ R detailPopulation(@RequestParam(value = "populationId") Long populationId);
+
+ /**
+ * 根据id修改实有人口标签列表
+ *
+ * @param populationTagDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/common/data/population/editTag")
+ R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
+
}
--
Gitblit v1.7.1