From d769a8683ea6f2ecbc451da71ca3079c6765a99d Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 13:05:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 2 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 17da062..9eef09f 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
@@ -119,7 +119,7 @@
      * @return
      */
     @PostMapping("/car/export")
-    public R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO){
+    public R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO){
         return comMngCarService.exportRealCar(exportComMngCarExcelDTO);
     }
 
@@ -132,6 +132,17 @@
     @PostMapping("/company/page")
     public R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO) {
         return comMngRealCompanyService.pageQueryComMngRealCompany(pageComMngRealCompanyDTO);
+    }
+
+    /**
+     * 社区后台实有单位统计
+     *
+     * @param communityId 社区id
+     * @return 统计结果
+     */
+    @PostMapping("/company/statistics")
+    public R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId){
+        return comMngRealCompanyService.getComMngRealCompanyTotalByAdmin(communityId);
     }
 
     /**
@@ -314,8 +325,60 @@
      */
     @PostMapping("/population/import")
     @Transactional(rollbackFor = Exception.class)
-    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId) throws Exception {
+    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
         return comMngPopulationService.listSavePopulation(list, communityId);
+    }
+
+    /**
+     * 批量导入吸毒人员
+     *
+     * @param list        吸毒人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("population/importDrug")
+    @Transactional(rollbackFor = Exception.class)
+    public R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+        return comMngPopulationService.listSaveDrugPopulation(list, communityId);
+    }
+
+    /**
+     * 批量导入社区矫正人员
+     *
+     * @param list        社区矫正人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("population/importCorrect")
+    @Transactional(rollbackFor = Exception.class)
+    public R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+        return comMngPopulationService.listSaveCorrectPopulation(list, communityId);
+    }
+
+    /**
+     * 批量导入重精人员
+     *
+     * @param list        重精人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @PostMapping("population/importMajor")
+    public R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+        return comMngPopulationService.listSaveMajorPopulation(list, communityId);
+    }
+
+    /**
+     * 批量导入邪教人员
+     *
+     * @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);
     }
 
     /**
@@ -410,6 +473,17 @@
     }
 
     /**
+     * 根据小区id查询实有人口
+     *
+     * @param villageId 小区id
+     * @return 查询结果
+     */
+    @PostMapping("/population/getListByVillageId")
+    R getPopulationListByVillageId(@RequestParam(value = "villageId") Long villageId){
+        return comMngPopulationService.getPopulationListByVillageId(villageId);
+    }
+
+    /**
      * 编辑实有人口
      *
      * @param populationEditDTO

--
Gitblit v1.7.1