From 77bd80eadf1d3b973f640b8e7d9b630d14afb2d8 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 15:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 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 8f9e87b..e770468 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;
@@ -394,6 +395,17 @@
@PostMapping("pagedynamic")
public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
return comActDynService.pageDynamic(comActDynVO);
+ }
+
+ /**
+ * 管理后台分页查询社区动态
+ *
+ * @param comActDynVO 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamicByAdmin")
+ public R pagedynamicByAdmin(@RequestBody ComActDynVO comActDynVO) {
+ return comActDynService.pageDynamicByAdmin(comActDynVO);
}
/**
@@ -1334,7 +1346,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);
}
/**
@@ -1408,4 +1426,13 @@
return comActQuestnaireService.pageQuestnaireAnswer(pageQuestnaireAnswerDTO);
}
+ /**
+ * 居民填写问卷调查问卷
+ * @param usersAnswerQuestnaireVO
+ */
+ @PostMapping("questnaire/usersanswequestnaire")
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO,@RequestParam("userId") Long userId){
+ return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
+ }
+
}
--
Gitblit v1.7.1