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 |   13 +++++++++++++
 1 files changed, 13 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 52e1c71..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
@@ -408,6 +408,19 @@
     }
 
     /**
+     * 批量导入服刑人员
+     *
+     * @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