From d7a8baeff8b0e68c54a959e5f46f639c54aad1d1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 17:15:29 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 99 +++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 48 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 7b0cc7a..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
@@ -9,8 +9,11 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
+import com.panzhihua.common.model.vos.community.reserve.ComActReserveRecordListVO;
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;
@@ -24,10 +27,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @auther lyq
@@ -51,24 +51,22 @@
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 -> {
- 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);
//查询用户回答
- List<ComActReserveAnswerContentDO> questnaireAnswerContentDOList = this.baseMapper.selectListByReserve(reserveId);
- List<ComActQuestnaireAnswerContentVO> vos = new ArrayList<>();
- questnaireAnswerContentDOList.forEach(dos -> {
- ComActQuestnaireAnswerContentVO vo = new ComActQuestnaireAnswerContentVO();
- BeanUtils.copyProperties(dos, vo);
- vos.add(vo);
- });
+ List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.selectListByReserve(reserveId);
result.setAnswers(vos);
+
return R.ok(result);
}
@@ -79,7 +77,7 @@
*/
@Override
public R registerDetailedListAdmin(PageReserveRegisterDetailedAdminDTO detailedAdminDTO){
- IPage<List<Map<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());
@@ -87,39 +85,44 @@
resultPage.setSize(registerDetailedPage.getSize());
resultPage.setPages(registerDetailedPage.getPages());
- List<List<Map<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++;
+ List<HashMap<String,String>> resultMapList = new ArrayList<>();
+ int nub = 1;
+ if(!registerDetailedPage.getRecords().isEmpty()){
+ for (ComActReserveRegisterDetailedVO registerDetailed:registerDetailedPage.getRecords()) {
+ //渲染序号
+ 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) {
+ 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("time", DateUtils.format(registerDetailed.getCreateAt(),DateUtils.ymdhms_format));
+ resultMapList.add(map);
+ nub++;
+ }
}
resultPage.setRecords(resultMapList);
- return R.ok(registerDetailedPage);
+ return R.ok(resultPage);
}
}
--
Gitblit v1.7.1