From c95870e474a35249b24fa2f5c45f59bf9b7581c5 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 13:17:00 +0800
Subject: [PATCH] 用户问卷答题详细
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java | 10 ++++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java | 6 ------
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 10 +++++++++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java | 10 ++++++----
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java | 15 +++++++++++++++
6 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
index a1c6d8a..1f12f3b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireAnswerContentVO.java
@@ -7,12 +7,6 @@
@Data
@ApiModel("问卷回答记录内容")
public class ComActQuestnaireAnswerContentVO {
- @ApiModelProperty("用户ID")
- private Long userId;
- @ApiModelProperty("问卷题目ID")
- private Long subId;
- @ApiModelProperty("id")
- private Long id;
@ApiModelProperty("问卷回答选项")
private String choice;
@ApiModelProperty("问卷回答内容")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
index ab6de4e..180284d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubSelectionVO.java
@@ -11,8 +11,8 @@
private Long id;
@ApiModelProperty("问题题目ID")
private Long queSubId;
- @ApiModelProperty("选项排序")
- private int optin;
+ @ApiModelProperty("选项名")
+ private String optionName;
@ApiModelProperty("选项内容")
private String content;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java
index f93f123..bd6ed2e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireSubVO.java
@@ -7,4 +7,14 @@
@Data
@ApiModel("问卷题目")
public class ComActQuestnaireSubVO {
+ @ApiModelProperty("id")
+ private Long id;
+ @ApiModelProperty("类型 0单选1多选2问答题")
+ private int type;
+ @ApiModelProperty("题目内容")
+ private String content;
+ @ApiModelProperty("序号")
+ private int sort;
+ @ApiModelProperty("调查问卷Id")
+ private Long queId;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java
index 82bf625..d66043d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActQuestnaireVO.java
@@ -1,9 +1,24 @@
package com.panzhihua.common.model.vos.community;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("调查问卷 问卷表")
public class ComActQuestnaireVO {
+ @ApiModelProperty("id")
+ private Long id;
+ @ApiModelProperty("标题")
+ private String title;
+ @ApiModelProperty("问题描述")
+ private String queDescribe;
+ @ApiModelProperty("状态 0 调研中 1已停止")
+ private int state;
+ @ApiModelProperty("参与人数")
+ private Integer joinCount;
+ @ApiModelProperty("社区ID")
+ private Long communityId;
+ @ApiModelProperty("问卷参与者类型 0 全部 1 志愿者 2 党员")
+ private Integer parterType;
}
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 b2d387f..dd7e4a9 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
@@ -23,11 +23,13 @@
*/
private Integer sort;
/**
- * 选项
- */
- private String option;
- /**
* 选项内容
*/
private String content;
+
+ /**
+ * 选项名
+ */
+ private String optionName;
+
}
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 46e90ac..a9bd6af 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
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Comparator;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -77,7 +78,7 @@
sub.getQuestnaiteSubSelectionVOS().forEach(subSelect -> {
ComActQuestnaireSubSelectionDO subSelectionDO = new ComActQuestnaireSubSelectionDO();
subSelectionDO.setQueSubId((long) subId);
- subSelectionDO.setOption(subSelect.getOption());
+ subSelectionDO.setOptionName(subSelect.getOption());
subSelectionDO.setSort(subSelect.getSort());
subSelectionDO.setContent(subSelect.getContent());
subSelectionDO.setCreateBy(userId);
@@ -169,10 +170,17 @@
usersAnswerVO.setQuestnaire(comActQuestnaireVO);
List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
+ list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort).reversed());
List<UsersSubAnswerVO> usersSubAnswerVOList = new ArrayList<>();
list.forEach(comActQuestnaireSubDO ->{
UsersSubAnswerVO usersSubAnswerVO = new UsersSubAnswerVO();
+ //问卷调查题目
+ ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
+ BeanUtils.copyProperties(comActQuestnaireSubDO, comActQuestnaireSubVO);
+ usersSubAnswerVO.setQuestSubVO(comActQuestnaireSubVO);
+
+ //问卷调查题目-选项
Long subId = comActQuestnaireSubDO.getId();
List<ComActQuestnaireSubSelectionDO> comActQuestnaireSubSelectionDOs =
questnaireSubSelectionDAO.selectList(new QueryWrapper<ComActQuestnaireSubSelectionDO>().lambda().eq(ComActQuestnaireSubSelectionDO::getQueSubId, subId));
--
Gitblit v1.7.1