From 35549e5bd57d1194966d010a957d90500b659c4c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 14 四月 2022 09:22:14 +0800
Subject: [PATCH] 电动车商城-拼团活动接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |   70 ++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 5 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 dbb97f4..c22cdd6 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
@@ -6,6 +6,7 @@
 
 import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
 import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -333,6 +334,29 @@
     public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
         return comMngPopulationService.pagePopulation(comMngPopulationVO);
     }
+    /**
+     * 社区后台老人导出管理列表
+     *
+     * @param comMngPopulationVO
+     *            查询参数
+     * @return 实有人口分页查询结果
+     */
+    @PostMapping("/population/exportOld")
+    public R exportOld(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
+        return comMngPopulationService.exportOld(comMngPopulationVO);
+    }
+
+    /**
+     * 根据身份证查询实有人口信息
+     */
+    @GetMapping("/population/selectByIdCard")
+    public R selectByIdCard(@RequestParam("idCard") String idCard){
+        ComMngPopulationDO comMngPopulationDO=comMngPopulationService.getPopulationByCardNo(idCard);
+        if(comMngPopulationDO!=null){
+            return R.ok(comMngPopulationDO.getAddress());
+        }
+        return R.fail();
+    }
 
     /**
      * 社区后台导入实有人口
@@ -607,13 +631,13 @@
     /**
      * 批量删除实有人口
      *
-     * @param Ids
+     * @param ids
      *            删除id集合
      * @return 删除结果
      */
     @PostMapping("/population/delete")
-    public R deletePopulations(@RequestBody List<Long> Ids) {
-        return comMngPopulationService.deletePopulations(Ids);
+    public R deletePopulations(@RequestBody List<Long> ids, Long communityId) {
+        return comMngPopulationService.deletePopulations(ids,communityId);
     }
 
     /**
@@ -675,6 +699,17 @@
     public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
         return comMngPopulationService.specialInputUser(pageInputUserDTO);
     }
+    /**
+     * 导出特殊群体
+     *
+     * @param pageInputUserDTO
+     *            请求参数
+     * @return 特殊群体列表
+     */
+    @PostMapping("/special/export")
+    public R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO) {
+        return comMngPopulationService.specialInputUserExport(pageInputUserDTO);
+    }
 
     /**
      * 删除特殊群体人员
@@ -684,8 +719,8 @@
      * @return 删除结果
      */
     @PostMapping("/special/delete")
-    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
-        return comMngPopulationService.deleteSpecialInputUser(id);
+    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam(value = "communityId") Long communityId) {
+        return comMngPopulationService.deleteSpecialInputUser(id,communityId);
     }
 
     /**
@@ -765,6 +800,18 @@
     @PostMapping("/population/second/list")
     public R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
         return comMngPopulationHouseService.getSecondHouseAddress(cascadeHouseDTO);
+    }
+
+    /**
+     * 查询房屋二级级联菜单后台
+     *
+     * @param cascadeHouseDTO
+     *            请求参数
+     * @return 菜单列表
+     */
+    @PostMapping("/population/second/listBack")
+    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+        return comMngPopulationHouseService.getSecondHouse(cascadeHouseDTO);
     }
 
     /**
@@ -910,4 +957,17 @@
     public R detailHousesUser(@RequestParam("id") Long id) {
         return comMngPopulationHouseUserService.detail(id);
     }
+
+    /**
+     * 历史数据人员类型填充
+     * @param newVoList
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/history/filled")
+    public R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
+                                 @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
+        return comMngPopulationService.filledPopulationPersonType(newVoList, communityId, userId);
+    }
 }

--
Gitblit v1.7.1