From aad170db8e65a67d1ba34e72a21eb19d91a05373 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 30 十一月 2021 17:26:22 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
index c056d76..bed5874 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -151,6 +151,7 @@
subSelectionDO.setCreateBy(userId);
subSelectionDO.setType(subSelect.getType());
subSelectionDO.setKey(subSelect.getKey());
+ subSelectionDO.setUrl(subSelect.getUrl());
subSelectionList.add(subSelectionDO);
}
}
@@ -477,12 +478,15 @@
* 查询题目
*/
List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(
- new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
+ new QueryWrapper<ComActQuestnaireSubDO>().lambda()
+ .eq(ComActQuestnaireSubDO::getQueId, questId).orderByAsc(ComActQuestnaireSubDO::getCreateAt));
List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
list.forEach(subDo -> {
- ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
- BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
- listSubVo.add(comActQuestnaireSubVO);
+ if(!subDo.getType().equals(ComActQuestnaireSubDO.type.describe)){
+ ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
+ BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
+ listSubVo.add(comActQuestnaireSubVO);
+ }
});
questnaireAnswersDTO.setSubs(listSubVo);
/**
@@ -506,10 +510,10 @@
@Override
public R pageQuestnaireAnswer(PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO) {
if (pageQuestnaireAnswerDTO.getPageNum() == null || pageQuestnaireAnswerDTO.getPageNum().longValue() == 0) {
- pageQuestnaireAnswerDTO.setPageNum(1l);
+ pageQuestnaireAnswerDTO.setPageNum(1L);
}
if (pageQuestnaireAnswerDTO.getPageSize() == null || pageQuestnaireAnswerDTO.getPageSize().longValue() == 0) {
- pageQuestnaireAnswerDTO.setPageSize(10l);
+ pageQuestnaireAnswerDTO.setPageSize(10L);
}
Page userPage = new Page(pageQuestnaireAnswerDTO.getPageNum(), pageQuestnaireAnswerDTO.getPageSize());
IPage<ComActQuestnaireAnswerContentVO> doPager =
@@ -580,7 +584,7 @@
Long queSubId = questnaireSubDO.getId();
// 根据上传的类型查询不同的题目选项
- if (questnaiteSub.getType().equals(QuestnaiteSubVO.type.danxuan)) {
+ if (questnaiteSub.getType().equals(QuestnaiteSubVO.type.danxuan) || questnaiteSub.getType().equals(QuestnaiteSubVO.type.imgselect)) {
// 单选题处理
ComActQuestnaireSubSelectionDO subSelectionDO =
questnaireSubSelectionDAO.selectOne(new QueryWrapper<ComActQuestnaireSubSelectionDO>().lambda()
--
Gitblit v1.7.1