From e74987c5c7e6256e84a0852f36a367bf8f2e032d Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 13 四月 2021 16:21:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 11 +++++++++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java | 5 +++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 10 +++++++---
4 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
index c201d71..61edf48 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
@@ -7,10 +7,14 @@
import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireAnswerStatVO;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -46,20 +50,20 @@
return communityService.addQuestnaire(questnaireVO, loginUserInfo.getCommunityId(), loginUserInfo.getUserId());
}
- @ApiOperation(value = "查看问卷", response = ComActQuestnaireVO.class)
+ @ApiOperation(value = "查看问卷", response = UsersAnswerVO.class)
@GetMapping("/view")
public R viewQuestnaire(@RequestParam("questId") Long questId) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
return communityService.view(loginUserInfo.getUserId(), questId);
}
- @ApiOperation(value = "在线统计信息", response = ComActQuestnaireVO.class)
+ @ApiOperation(value = "在线统计信息", response = QuestnaireAnswerStatVO.class)
@GetMapping("/stat")
public R stat(@RequestParam("questId") Long questId) {
return communityService.statistics(questId);
}
- @ApiOperation(value = "在线统计详细", response = ComCvtBusinessVO.class)
+ @ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
@GetMapping("/stat/details")
public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
//问卷调查
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java
index ee4bd8a..3068d3f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java
@@ -20,4 +20,7 @@
@ApiModelProperty(value = "选项内容")
private String content;
+
+ @ApiModelProperty(value = "选项类型 0 固定选项 1 自定义选项")
+ private Integer type;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java
index bf5d93a..1394404 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java
@@ -35,4 +35,9 @@
*/
private String optionName;
+ /**
+ * 选项类型 0 固定选项 1 自定义选项
+ */
+ private Integer type;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
index aeaab44..1bb7bb5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -32,6 +32,7 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubSelectionVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -57,6 +58,7 @@
ComActQuestnaireAnswerContentServiceImpl answerContentService;
@Override
+ @Transactional(rollbackFor = Exception.class)
public R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
ComActQuestnaireDO comActQuestnaireDO = new ComActQuestnaireDO();
comActQuestnaireDO.setTitle(questnaireVO.getQueTitle());
@@ -70,22 +72,27 @@
comActQuestnaireDO.setForParty(questnaireVO.getForParty());
comActQuestnaireDO.setForVolunteer(questnaireVO.getForVolunteer());
int questId = questnaireDAO.insert(comActQuestnaireDO);
+ if(questId!=1){
+ return R.fail("创建失败");
+ }
questnaireVO.getQuestnaiteSubVOS().forEach(sub -> {
ComActQuestnaireSubDO comActQuestnaireSubDO = new ComActQuestnaireSubDO();
comActQuestnaireSubDO.setType(sub.getType());
comActQuestnaireSubDO.setContent(sub.getContent());
comActQuestnaireSubDO.setSort(sub.getSort());
- comActQuestnaireSubDO.setQueId((long) questId);
+ comActQuestnaireSubDO.setQueId((long) comActQuestnaireDO.getId());
comActQuestnaireSubDO.setCreateBy(userId);
int subId = questnaireSubDAO.insert(comActQuestnaireSubDO);
+
ArrayList<ComActQuestnaireSubSelectionDO> subSelectionList = Lists.newArrayList();
sub.getQuestnaiteSubSelectionVOS().forEach(subSelect -> {
ComActQuestnaireSubSelectionDO subSelectionDO = new ComActQuestnaireSubSelectionDO();
- subSelectionDO.setQueSubId((long) subId);
+ subSelectionDO.setQueSubId(comActQuestnaireSubDO.getId());
subSelectionDO.setOptionName(subSelect.getOptionName());
subSelectionDO.setSort(subSelect.getSort());
subSelectionDO.setContent(subSelect.getContent());
subSelectionDO.setCreateBy(userId);
+ subSelectionDO.setType(subSelect.getType());
subSelectionList.add(subSelectionDO);
});
subSelectionService.saveBatch(subSelectionList);
--
Gitblit v1.7.1