From 147a7ce2b1cc45cb58c69c82c3b0e0b2d3910b05 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 03 九月 2021 18:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
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 7c75673..c056d76 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
@@ -192,6 +192,9 @@
if (vo.getAdverPositionApplication().equals(ComActQuestnaireDO.isOk.yes)) {
sb.append("首页应用,");
}
+ if (vo.getIsCover().equals(ComActQuestnaireDO.isOk.yes)) {
+ sb.append("设置封面,");
+ }
String advertPosition = sb.toString();
if (advertPosition.length() > 0) {
vo.setAdvertPosition(advertPosition.substring(0, advertPosition.length() - 1));
@@ -485,15 +488,9 @@
/**
* 查询用户回答
*/
- List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
+ List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentDOList =
questnaireAnswerContentDAO.selectListByQuestnaire(questId);
- List<ComActQuestnaireAnswerContentVO> vos = new ArrayList<>();
- questnaireAnswerContentDOList.forEach(dos -> {
- ComActQuestnaireAnswerContentVO vo = new ComActQuestnaireAnswerContentVO();
- BeanUtils.copyProperties(dos, vo);
- vos.add(vo);
- });
- questnaireAnswersDTO.setAnswers(vos);
+ questnaireAnswersDTO.setAnswers(questnaireAnswerContentDOList);
return R.ok(questnaireAnswersDTO);
}
@@ -584,7 +581,6 @@
Long queSubId = questnaireSubDO.getId();
// 根据上传的类型查询不同的题目选项
if (questnaiteSub.getType().equals(QuestnaiteSubVO.type.danxuan)) {
-
// 单选题处理
ComActQuestnaireSubSelectionDO subSelectionDO =
questnaireSubSelectionDAO.selectOne(new QueryWrapper<ComActQuestnaireSubSelectionDO>().lambda()
@@ -648,8 +644,6 @@
}
// 新增用户填写的答卷
if (!answerContentList.isEmpty()) {
- answerContentService.saveBatch(answerContentList);
-
// 更新回答用户数量
Integer joinCount = questnaireDO.getJoinCount();
questnaireDO.setJoinCount(joinCount != null ? joinCount + 1 : 1);
@@ -663,6 +657,11 @@
userAnswerDO.setJsonObject(answerQuestnaireVO.getJsonObject());
comActQuestnaireUserAnswerMapper.insert(userAnswerDO);
+ answerContentList.forEach(answerContent -> {
+ answerContent.setAnswerId(userAnswerDO.getId());
+ });
+ answerContentService.saveBatch(answerContentList);
+
}
return R.ok();
}
--
Gitblit v1.7.1