From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 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 57ca6f3..8f9e87b 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
@@ -5,26 +5,22 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
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.user.UserPhoneVO;
-import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.service.*;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -1261,12 +1257,12 @@
public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) {
return comActMessageService.deleteMessage(comActMessageVO);
}
-
+
@PostMapping("resetmessagepublic")
public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) {
return comActMessageService.resetMessagePublic(resetComActMessageVO);
}
-
+
/**
* 留言详情
*
@@ -1300,13 +1296,23 @@
}
/**
- * 查看用户问卷调查详细
+ * 查看问卷调查详细
* @param questId 问卷ID
* @return 用户问卷调查详细
*/
@GetMapping("questnaire/view")
- public R view(@RequestParam("questId") Long questId) {
- return comActQuestnaireService.infoQuestnaire(questId);
+ public R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId) {
+ /**
+ * 根据用户身份分别返回 数据
+ */
+ /* 问卷参与者， 已提交问卷则返回问卷详细， 否则返回空的问卷 */
+ boolean isMember = true;//默认情况下，可不做逻辑判断，直接查询返回用户答卷
+ if(isMember) {
+ return comActQuestnaireService.answerInfoQuestnaire(userId, questId);
+ }else {
+ /*非问卷参与者 返回问卷“预览” */
+ return comActQuestnaireService.infoQuestnaire(questId);
+ }
}
@@ -1315,6 +1321,7 @@
* @param questnaireVO
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
@PostMapping("questnaire/addquestnaire")
public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
return comActQuestnaireService.addQuestnaire(questnaireVO, communityId, userId);
@@ -1326,8 +1333,8 @@
* @return
*/
@PostMapping("questnaire/pagequestnaire")
- public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
- return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO);
+ public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
+ return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO,communityId);
}
/**
@@ -1335,6 +1342,7 @@
* @param questnaireVO
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
@PostMapping("questnaire/editquestnaire")
public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
return comActQuestnaireService.editQuestnaire(questnaireVO);
@@ -1355,6 +1363,7 @@
* @param questId 调查问卷Id
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
@PostMapping("questnaire/deletequestnaire")
public R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId) {
return comActQuestnaireService.deleteQuestnaire(questId,userId);
@@ -1370,4 +1379,33 @@
return comActQuestnaireService.statQuestnaire(questId);
}
+ /**
+ * 问卷答题结果
+ *
+ * @param questId 问卷ID
+ */
+ @PostMapping("questnaire/answerslist")
+ public R answerResultList(@RequestParam("questId")Long questId){
+ return comActQuestnaireService.answerResultList(questId);
+ }
+ /**
+ * 问卷题目 答卷信息
+ *
+ * @param pageQuestnaireSubDetailsDTO 问卷ID
+ */
+ @PostMapping("questnaire/qaqeustanswerdetails")
+ public R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO){
+ return comActQuestnaireService.qaQeustDetails(pageQuestnaireSubDetailsDTO);
+ }
+
+ /**
+ * 社区问卷回答用户分页
+ * @param pageQuestnaireAnswerDTO
+ * @return 分页数据
+ */
+ @PostMapping("questnaire/pagequestnaireanswer")
+ public R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO){
+ return comActQuestnaireService.pageQuestnaireAnswer(pageQuestnaireAnswerDTO);
+ }
+
}
--
Gitblit v1.7.1