Merge branch 'test' into 'master'

罗元桥

2021-08-31 b9b493e3da134f8e4eb36e5b831063fd27fef417

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java

@@ -59,23 +59,10 @@
        });
        result.setSubs(listSubVo);

        Long reserveRecordId = null;
        //查询用户回答
        List<ComActReserveAnswerContentDO> questnaireAnswerContentDOList = this.baseMapper.selectListByReserve(reserveId);
        List<ComActQuestnaireAnswerContentVO> vos = new ArrayList<>();
        for (ComActReserveAnswerContentDO dos:questnaireAnswerContentDOList) {
            ComActQuestnaireAnswerContentVO vo = new ComActQuestnaireAnswerContentVO();
            BeanUtils.copyProperties(dos, vo);
            reserveRecordId = dos.getReserveRecordId();
            vos.add(vo);
        }
        List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.selectListByReserve(reserveId);
        result.setAnswers(vos);

        //查询用户提交信息
        ComActReserveRegisterDetailedVO recordListVO = this.baseMapper.getRegisterDetailedById(reserveRecordId);
        if(recordListVO != null){
            result.setRecordListVO(recordListVO);
        }
        return R.ok(result);
    }