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/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 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 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