From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 2093f1d..deab443 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -794,6 +794,16 @@
     }
 
     /**
+     * 获取志愿者详情
+     * @param id
+     * @return
+     */
+    @GetMapping("getVolunteerById")
+    R getVolunteerById(@RequestParam("id")Long id){
+        return comMngVolunteerMngService.getVolunteerById(id);
+    }
+
+    /**
      * 删除志愿者
      * @param comMngVolunteerMngVO 手机号
      * @return 删除结果
@@ -1346,7 +1356,13 @@
      */
     @PostMapping("questnaire/pagequestnaire")
     public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
-        return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO,communityId);
+        if(pageQuestnaireDTO.getForParty()==null){
+            pageQuestnaireDTO.setForParty(false);
+        }
+        if(pageQuestnaireDTO.getForVolunteer()==null){
+            pageQuestnaireDTO.setForVolunteer(false);
+        }
+        return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO, communityId);
     }
 
     /**
@@ -1429,4 +1445,13 @@
         return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
     }
 
+    /**
+     * 删除微心愿
+     * @param id
+     * @return
+     */
+    @PostMapping("deletemicrowish")
+    public R deletemicrowish(@RequestParam("id") Long id){
+        return comActMicroWishService.deleteMicroWish(id);
+    }
 }

--
Gitblit v1.7.1