Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-09 91a2f11b8b74aa170abc32d2b5d9603b279c094d

 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;
@@ -34,7 +35,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @Author: llming
@@ -173,8 +173,8 @@
    public R answerInfoQuestnaire(Long userId, Long questId) {

        ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
        if (comActQuestnaireDO == null) {
            return R.fail("问卷不存在!");
        if(comActQuestnaireDO==null){
            return  R.fail("问卷不存在!");
        }

        UsersAnswerVO usersAnswerVO = new UsersAnswerVO();
@@ -183,10 +183,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 -> {
        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));
@@ -205,7 +212,7 @@
                                    .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));

                    List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentVOList = new ArrayList<>();
                    questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO -> {
                    questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO->{
                        ComActQuestnaireAnswerContentVO comActQuestnaireSubSelectionVO = new ComActQuestnaireAnswerContentVO();
                        BeanUtils.copyProperties(questnaireAnswerContentDO, comActQuestnaireSubSelectionVO);
                        questnaireAnswerContentVOList.add(comActQuestnaireSubSelectionVO);