预约登记后台接口问题修改

huanghongfa

2021-08-27 b7968492c4876c1e2b7656e48ba535a2002ab105

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

@@ -79,7 +79,7 @@
     */
    @Override
    public R registerDetailedListAdmin(PageReserveRegisterDetailedAdminDTO detailedAdminDTO){
        IPage<List<Map<String,Object>>> resultPage = new Page<>();
        IPage<HashMap<String,Object>> resultPage = new Page<>();

        IPage<ComActReserveRegisterDetailedVO> registerDetailedPage = this.baseMapper.pageRegisterDetailedListAdmin(new Page(detailedAdminDTO.getPageNum(),detailedAdminDTO.getPageSize()),detailedAdminDTO);
        resultPage.setCurrent(registerDetailedPage.getCurrent());
@@ -87,39 +87,31 @@
        resultPage.setSize(registerDetailedPage.getSize());
        resultPage.setPages(registerDetailedPage.getPages());

        List<List<Map<String,Object>>> resultMapList = new ArrayList<>();
        List<HashMap<String,Object>> resultMapList = new ArrayList<>();
        Integer nub = 1;
        for (ComActReserveRegisterDetailedVO registerDetailed:registerDetailedPage.getRecords()) {
            List<Map<String,Object>> mapList = new ArrayList<>();
            //渲染序号
            Map<String,Object> nubMap = new HashMap<>();
            nubMap.put("nub",nub);
            mapList.add(nubMap);
            //渲染用户昵称
            Map<String,Object> nickNameMap = new HashMap<>();
            nickNameMap.put("nickName",registerDetailed.getNickName());
            mapList.add(nickNameMap);

            //查询记录填写答案并装载到数据集中
            List<ComActReserveRegisterDetailedAnswerVO> registerDetailedAnswerList = this.baseMapper.getRegisterDetailedAnswerList(registerDetailed.getId());
            registerDetailedAnswerList.forEach(detailed -> {
                Map<String,Object> detailedMap = new HashMap<>();
                detailedMap.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
                mapList.add(detailedMap);
            });

            //渲染登记流水号
            Map<String,Object> idMap = new HashMap<>();
            idMap.put("id",registerDetailed.getId());
            mapList.add(idMap);
            //渲染登记时间
            Map<String,Object> timeMap = new HashMap<>();
            timeMap.put("time",registerDetailed.getCreateAt());
            mapList.add(timeMap);
            resultMapList.add(mapList);
            nub++;
        if(!registerDetailedPage.getRecords().isEmpty()){
            for (ComActReserveRegisterDetailedVO registerDetailed:registerDetailedPage.getRecords()) {
                //渲染序号
                HashMap<String,Object> map = new HashMap<>();
                map.put("nub",nub);
                //渲染用户昵称
                map.put("nickName",registerDetailed.getNickName());
                //查询记录填写答案并装载到数据集中
                List<ComActReserveRegisterDetailedAnswerVO> registerDetailedAnswerList = this.baseMapper.getRegisterDetailedAnswerList(registerDetailed.getId());
                if(!registerDetailedAnswerList.isEmpty()){
                    for (ComActReserveRegisterDetailedAnswerVO detailed:registerDetailedAnswerList) {
                        map.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
                    }
                }
                //渲染登记流水号
                map.put("id",registerDetailed.getId());
                //渲染登记时间
                map.put("time",registerDetailed.getCreateAt());
                resultMapList.add(map);
                nub++;
            }
        }
        resultPage.setRecords(resultMapList);
        return R.ok(registerDetailedPage);
        return R.ok(resultPage);
    }
}