Merge branch 'test' into zzj

101captain

2021-08-31 d4f73636b9e92824c5c5e10ee49dc4dd944c9198

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

@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRecordListVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
import com.panzhihua.common.utlis.DateUtils;
@@ -58,15 +59,23 @@
        });
        result.setSubs(listSubVo);

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

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