From d2a5b25d25e8912d3e9e4ae5f9a315c386060f25 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 14 四月 2021 11:31:33 +0800
Subject: [PATCH] bug fixed: 过滤删除的调查问卷，添加调查问卷 调查对象

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java |   84 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index baf7d0c..fc17484 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -1,6 +1,7 @@
 package com.panzhihua.service_user.api;
 
 import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
 import com.panzhihua.common.model.dtos.community.ExportUserDTO;
 import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
 import com.panzhihua.common.model.dtos.user.*;
@@ -147,6 +148,15 @@
     @PostMapping("listtag")
     public R listTag(){
         return userService.listTag();
+    }
+
+    /**
+     * 查询当前社区所有标签以及预设标签
+     * @return 标签集合
+     */
+    @PostMapping("listtag/getTag")
+    public R listTags(@RequestParam("communityId") Long communityId){
+        return userService.listTags(communityId);
     }
 
     /**
@@ -605,7 +615,7 @@
      * @param pageInputUserDTO 查询参数
      * @return 分页数据
      */
-    @PostMapping("/common/data/user/page")
+    @PostMapping("common/data/user/page")
     public R pageInputUser(@RequestBody PageInputUserDTO pageInputUserDTO){
         return sysUserInputService.pageInputUser(pageInputUserDTO);
     }
@@ -615,7 +625,7 @@
      * @param inputUserTagsDTO 标签信息
      * @return 设置结果
      */
-    @PostMapping("/common/data/user/tags")
+    @PostMapping("common/data/user/tags")
     public R setInputUserTag(@RequestBody InputUserTagsDTO inputUserTagsDTO){
         return sysUserInputService.putUserTag(inputUserTagsDTO);
     }
@@ -626,7 +636,7 @@
      * @param areaName 小区名字
      * @return 导入结果
      */
-    @PostMapping("/common/data/user/import")
+    @PostMapping("common/data/user/import")
     public R batchSaveInputUser(@RequestBody List<EexcelUserDTO> list,@RequestParam("areaName")StringBuffer areaName){
         R r = null;
         try {
@@ -651,10 +661,9 @@
      * @param id 人员id
      * @return CommunityUserInfoVO
      */
-    @PostMapping("/common/data/user/detail")
+    @PostMapping("common/data/user/detail")
     public R inputUserDetail(@RequestParam("id")Long id){
-        InputUserInfoVO inputUserInfoVO=sysUserInputService.inputUserDetail(id);
-        return R.ok(inputUserInfoVO);
+        return sysUserInputService.inputUserDetail(id);
     }
 
     /**
@@ -662,8 +671,67 @@
      * @param exportUserDTO 用户搜索内容
      * @return List<EexcelUserDTO> excel内容
      */
-    @PostMapping("/common/data/user/export")
+    @PostMapping("common/data/user/export")
     public R inputUserExport(@RequestBody ExportUserDTO exportUserDTO){
-        return sysUserInputService.export(exportUserDTO);
+        return sysUserInputService.exportInputUser(exportUserDTO);
+    }
+
+    /**
+     * 特殊群体
+     * @param pageInputUserDTO
+     * @return
+     */
+    @PostMapping("common/data/special/page")
+    R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
+        return sysUserInputService.specialInputUser(pageInputUserDTO);
+    }
+
+    /**
+     * 特殊群体
+     * @param id
+     * @return
+     */
+    @DeleteMapping("common/data/special/delete")
+    R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
+        return sysUserInputService.deleteSpecialInputUser(id);
+    }
+    /**
+     * 特殊群体标签列表
+     * @param comMngUserTagDTO
+     * @return
+     */
+    @PostMapping("common/data/special/tags/page")
+    R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO) {
+        return sysUserInputService.specialInputUserTags(comMngUserTagDTO);
+    }
+
+    /**
+     * 新增或修改特殊群体标签
+     * @param comMngTagVO
+     * @return
+     */
+    @PostMapping("common/data/special/tags/save")
+    R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO) {
+        return sysUserInputService.saveSpecialInputUserTags(comMngTagVO);
+    }
+
+    /**
+     * 删除特殊群体标签
+     * @param id
+     * @return
+     */
+    @DeleteMapping("common/data/special/tags/delete")
+    R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id) {
+        return sysUserInputService.deleteSpecialInputUserTags(id);
+    }
+
+    /**
+     * 特殊群体导出
+     * @param exportSpecialUserDTO
+     * @return
+     */
+    @PostMapping("common/data/special/export")
+    R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO) {
+        return sysUserInputService.specialUserExport(exportSpecialUserDTO);
     }
 }

--
Gitblit v1.7.1