java/zhihuishenqu.git

			@@ -13,6 +13,7 @@
			import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO;
			import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
			import com.panzhihua.common.utlis.DateUtils;
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.service_community.dao.ComActReserveAnswerContentMapper;
			import com.panzhihua.service_community.dao.ComActReserveSubMapper;
			import com.panzhihua.service_community.model.dos.ComActQuestnaireAnswerContentDO;
			@@ -50,12 +51,15 @@
			QuestnaireAnswersDTO result = new QuestnaireAnswersDTO();

			//查询题目
			List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda().eq(ComActReserveSubDO::getReserveId, reserveId));
			List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda()
			.eq(ComActReserveSubDO::getReserveId, reserveId).orderByAsc(ComActReserveSubDO::getCreateAt));
			List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
			list.forEach(subDo -> {
			ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
			BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
			listSubVo.add(comActQuestnaireSubVO);
			if(!subDo.getType().equals(5)){
			ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
			BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
			listSubVo.add(comActQuestnaireSubVO);
			}
			});
			result.setSubs(listSubVo);

			@@ -73,7 +77,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());
			@@ -81,24 +85,37 @@
			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());
			//查询记录填写答案并装载到数据集中
			List<ComActReserveRegisterDetailedAnswerVO> registerDetailedAnswerList = this.baseMapper.getRegisterDetailedAnswerList(registerDetailed.getId());
			if(!registerDetailedAnswerList.isEmpty()){
			for (ComActReserveRegisterDetailedAnswerVO detailed:registerDetailedAnswerList) {
			map.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
			if(!detailed.getType().equals(5)){
			if(detailed.getType().equals(1)){
			String key = detailed.getReserveSubId() + "";
			String value = map.get(key);
			if(StringUtils.isNotEmpty(value)){
			value = value + "," + detailed.getAnswerContent();
			}else{
			value = detailed.getAnswerContent();
			}
			map.put(key,value);
			}else{
			map.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
			}
			}
			}
			}
			//渲染登记流水号
			map.put("id",registerDetailed.getId());
			map.put("id",registerDetailed.getId() + "");
			//渲染登记时间
			map.put("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format));
			resultMapList.add(map);