Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-08 a2484b2ba1d7cc230f73bd013477d329e4faed6b

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

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

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

        List<HashMap<String,Object>> resultMapList = new ArrayList<>();
        Integer nub = 1;
        List<HashMap<String,String>> resultMapList = new ArrayList<>();
        int nub = 1;
        if(!registerDetailedPage.getRecords().isEmpty()){
            for (ComActReserveRegisterDetailedVO registerDetailed:registerDetailedPage.getRecords()) {
                //渲染序号
                HashMap<String,Object> map = new HashMap<>();
                map.put("nub",nub);
                HashMap<String,String> map = new HashMap<>();
                map.put("nub",nub + "");
                //渲染用户昵称
                map.put("nickName",registerDetailed.getNickName());
                //查询记录填写答案并装载到数据集中
@@ -100,7 +100,7 @@
                        if(!detailed.getType().equals(5)){
                            if(detailed.getType().equals(1)){
                                String key = detailed.getReserveSubId() + "";
                                String value = map.get(key).toString();
                                String value = map.get(key);
                                if(StringUtils.isNotEmpty(value)){
                                    value = value + "," + detailed.getAnswerContent();
                                }else{
@@ -114,7 +114,7 @@
                    }
                }
                //渲染登记流水号
                map.put("id",registerDetailed.getId());
                map.put("id",registerDetailed.getId() + "");
                //渲染登记时间
                map.put("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format));
                resultMapList.add(map);