From b4e0a04a66331d21bfbf11b1d22c40d6889347d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 15:00:02 +0800
Subject: [PATCH] bug修复

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java |   18 +++++++-----------
 1 files changed, 7 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 306657d..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
@@ -488,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);
     }
@@ -587,7 +581,6 @@
                 Long queSubId = questnaireSubDO.getId();
                 // 根据上传的类型查询不同的题目选项
                 if (questnaiteSub.getType().equals(QuestnaiteSubVO.type.danxuan)) {
-
                     // 单选题处理
                     ComActQuestnaireSubSelectionDO subSelectionDO =
                         questnaireSubSelectionDAO.selectOne(new QueryWrapper<ComActQuestnaireSubSelectionDO>().lambda()
@@ -651,8 +644,6 @@
         }
         // 新增用户填写的答卷
         if (!answerContentList.isEmpty()) {
-            answerContentService.saveBatch(answerContentList);
-
             // 更新回答用户数量
             Integer joinCount = questnaireDO.getJoinCount();
             questnaireDO.setJoinCount(joinCount != null ? joinCount + 1 : 1);
@@ -666,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