1112修改提交

101captain

2021-11-12 e959172a457f60c2e16b69f60e3404df5fdffcfe

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

@@ -43,16 +43,16 @@

    /**
     * 导出登记明细数据
     * @param reserveId 登记id
     * @param pageReserveRegisterDetailedAdminDTO 登记id
     * @return  登记明细数据
     */
    @Override
    public R exportRegisterAdmin(Long reserveId){
    public R exportRegisterAdmin(PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO){
        QuestnaireAnswersDTO result = new QuestnaireAnswersDTO();

        //查询题目
        List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
                .eq(ComActReserveSubDO::getReserveId, reserveId).orderByAsc(ComActReserveSubDO::getCreateAt).orderByAsc(ComActReserveSubDO::getId));
                .eq(ComActReserveSubDO::getReserveId, pageReserveRegisterDetailedAdminDTO.getReserveId()).orderByAsc(ComActReserveSubDO::getCreateAt).orderByAsc(ComActReserveSubDO::getId));
        List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
        list.forEach(subDo -> {
            if(!subDo.getType().equals(5)){
@@ -64,7 +64,7 @@
        result.setSubs(listSubVo);

        //查询用户回答
        List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.selectListByReserve(reserveId);
        List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.export(pageReserveRegisterDetailedAdminDTO);
        result.setAnswers(vos);

        return R.ok(result);
@@ -92,6 +92,8 @@
                //渲染序号
                HashMap<String,String> map = new HashMap<>();
                map.put("nub",nub + "");
                //渲染登记时间
                map.put("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format));
                //渲染用户昵称
                map.put("nickName",registerDetailed.getNickName());
                //查询记录填写答案并装载到数据集中
@@ -116,8 +118,6 @@
                }
                //渲染登记流水号
                map.put("id",registerDetailed.getId() + "");
                //渲染登记时间
                map.put("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format));
                resultMapList.add(map);
                nub++;
            }