From c1e48a47b39dbd6919bfd9cf2e7023e9f3d6fee8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 05 十一月 2021 10:24:21 +0800
Subject: [PATCH] 1105测试代码修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index d8c7e9d..28fd379 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -51,7 +51,8 @@
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).orderByAsc(ComActReserveSubDO::getId));
List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
list.forEach(subDo -> {
if(!subDo.getType().equals(5)){
@@ -76,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());
@@ -84,13 +85,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 +101,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 +115,7 @@
}
}
//渲染登记流水号
- map.put("id",registerDetailed.getId());
+ map.put("id",registerDetailed.getId() + "");
//渲染登记时间
map.put("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format));
resultMapList.add(map);
--
Gitblit v1.7.1