From a6c12e55d60ba3e023e15e6e7f6ac1791f424a1c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 06 九月 2021 09:28:34 +0800
Subject: [PATCH] 高龄老人认证
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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..004977b 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,6 +9,7 @@
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;
@@ -52,21 +53,18 @@
List<ComActReserveSubDO> list = comActReserveSubMapper.selectList(new QueryWrapper<ComActReserveSubDO>().lambda().eq(ComActReserveSubDO::getReserveId, reserveId));
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);
}
@@ -98,7 +96,9 @@
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)){
+ map.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
+ }
}
}
//渲染登记流水号
--
Gitblit v1.7.1