From add39a5a140ca34752dc8f91a1b7f8f3b8185b72 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 06 八月 2021 15:54:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index 72582d2..bf0aed0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -369,6 +369,58 @@
}
/**
+ * 批量导入邪教人员
+ *
+ * @param list 邪教人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("population/importCult")
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ return comMngPopulationService.listSaveCultPopulation(list, communityId);
+ }
+
+ /**
+ * 批量导入刑释人员
+ *
+ * @param list 刑释人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("population/importRehabilitation")
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ return comMngPopulationService.listSaveRehabilitationPopulation(list, communityId);
+ }
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list 重点上访人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importKey")
+ public R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ return comMngPopulationService.listSaveKeyPopulation(list, communityId);
+ }
+
+ /**
+ * 批量导入服刑人员
+ *
+ * @param list 服刑人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importSentence")
+ public R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ return comMngPopulationService.listSaveSentencePopulation(list, communityId);
+ }
+
+ /**
* 确认导入实有人口（有则更新，无则新建）
*
* @param list 用户信息
--
Gitblit v1.7.1