From 6375ca6c370b007d68786ec7dd941c6eb0e4efa7 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 09:27:57 +0800
Subject: [PATCH] bugfixed: 78658
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 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 39bf6ef..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
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
@@ -793,6 +794,16 @@
}
/**
+ * 获取志愿者详情
+ * @param id
+ * @return
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id")Long id){
+ return comMngVolunteerMngService.getVolunteerById(id);
+ }
+
+ /**
* 删除志愿者
* @param comMngVolunteerMngVO 手机号
* @return 删除结果
@@ -1345,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);
}
/**
@@ -1419,4 +1436,22 @@
return comActQuestnaireService.pageQuestnaireAnswer(pageQuestnaireAnswerDTO);
}
+ /**
+ * 居民填写问卷调查问卷
+ * @param usersAnswerQuestnaireVO
+ */
+ @PostMapping("questnaire/usersanswequestnaire")
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO,@RequestParam("userId") Long userId){
+ 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