From e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:04:46 +0800
Subject: [PATCH] 1109修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 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 4c85791..3e7a335 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,9 +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;
@@ -41,32 +43,30 @@
/**
* 导出登记明细数据
- * @param reserveId 登记id
+ * @param pageReserveRegisterDetailedAdminDTO 登记id
* @return 登记明细数据
*/
@Override
- public R exportRegisterAdmin(Long reserveId){
+ public R exportRegisterAdmin(PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO){
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, pageReserveRegisterDetailedAdminDTO.getReserveId()).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.export(pageReserveRegisterDetailedAdminDTO);
result.setAnswers(vos);
+
return R.ok(result);
}
@@ -77,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());
@@ -85,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);
--
Gitblit v1.7.1