From a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 15:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 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 5b387a6..98a23a4 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
@@ -13,7 +13,8 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.questnaire.*;
+import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.service_community.dao.ComActQuestnaireAnswerContentDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireSubDAO;
@@ -29,11 +30,12 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubSelectionVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersSubAnswerVO;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
/**
* @Author: llming
@@ -55,7 +57,7 @@
ComActQuestnaireSubSelectionServiceImpl subSelectionService;
@Override
- public R AddQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
+ public R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
ComActQuestnaireDO comActQuestnaireDO = new ComActQuestnaireDO();
comActQuestnaireDO.setTitle(questnaireVO.getQueTitle());
comActQuestnaireDO.setQueDescribe(questnaireVO.getQueDescribe());
@@ -63,14 +65,16 @@
comActQuestnaireDO.setJoinCount(0);
comActQuestnaireDO.setCommunityId(communityId);
comActQuestnaireDO.setCreateBy(userId);
- comActQuestnaireDO.setParterType(questnaireVO.getParterType());
- int questnaireId = questnaireDAO.insert(comActQuestnaireDO);
+ comActQuestnaireDO.setForMasses(questnaireVO.getForMasses());
+ comActQuestnaireDO.setForParty(questnaireVO.getForParty());
+ comActQuestnaireDO.setForVolunteer(questnaireVO.getForVolunteer());
+ int questId = questnaireDAO.insert(comActQuestnaireDO);
questnaireVO.getQuestnaiteSubVOS().forEach(sub -> {
ComActQuestnaireSubDO comActQuestnaireSubDO = new ComActQuestnaireSubDO();
comActQuestnaireSubDO.setType(sub.getType());
comActQuestnaireSubDO.setContent(sub.getContent());
comActQuestnaireSubDO.setSort(sub.getSort());
- comActQuestnaireSubDO.setQueId((long) questnaireId);
+ comActQuestnaireSubDO.setQueId((long) questId);
comActQuestnaireSubDO.setCreateBy(userId);
int subId = questnaireSubDAO.insert(comActQuestnaireSubDO);
ArrayList<ComActQuestnaireSubSelectionDO> subSelectionList = Lists.newArrayList();
@@ -89,9 +93,12 @@
}
@Override
- public R PageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) {
+ public R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) {
Page userPage = new Page(pageQuestnaireDTO.getPageNum(), pageQuestnaireDTO.getPageSize());
LambdaQueryWrapper<ComActQuestnaireDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(ComActQuestnaireDO::getCommunityId, 0);
+ //过滤隐藏字段
+ lambdaQueryWrapper.eq(ComActQuestnaireDO::getIsHide, 0);
if (pageQuestnaireDTO.getTitle() != null) {
lambdaQueryWrapper.like(ComActQuestnaireDO::getTitle, pageQuestnaireDTO.getTitle());
}
@@ -110,10 +117,10 @@
}
@Override
- public R editQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
+ public R editQuestnaire(QuestnaireVO questnaireVO) {
ComActQuestnaireDO questnaireDO = null;
- if (questnaireVO.getQueId() != null && questnaireVO.getQueId() != 0L) {
- questnaireDO = questnaireDAO.selectById(questnaireVO.getQueId());
+ if (questnaireVO.getQuestId() != null && questnaireVO.getQuestId() != 0L) {
+ questnaireDO = questnaireDAO.selectById(questnaireVO.getQuestId());
if (questnaireDO == null) {
return R.fail(500, "id有误！");
}
@@ -148,9 +155,26 @@
}
@Override
- public R deleteQuestnaire(Long queId) {
- LambdaQueryWrapper<ComActQuestnaireDO> subParam = new LambdaQueryWrapper<ComActQuestnaireDO>().eq(ComActQuestnaireDO::getId, queId);
+ public R editQuestnaireDO(EditComActQuestnaireVo editComActQuestnaireVo, Long userId) {
+ LambdaQueryWrapper<ComActQuestnaireDO> subParam = new LambdaQueryWrapper<ComActQuestnaireDO>().eq(ComActQuestnaireDO::getId, editComActQuestnaireVo.getQuestId());
+ ComActQuestnaireDO questDO = questnaireDAO.selectOne(subParam);
+ if (questDO == null) {
+ return R.fail(500, "Id有误！");
+ }
+ questDO.setState(editComActQuestnaireVo.getState());
+ questDO.setUpdateBy(userId);
+ questnaireDAO.updateById(questDO);
+ return R.ok();
+ }
+
+ @Override
+ public R deleteQuestnaire(Long questId, Long userId) {
+ LambdaQueryWrapper<ComActQuestnaireDO> subParam = new LambdaQueryWrapper<ComActQuestnaireDO>().eq(ComActQuestnaireDO::getId, questId);
ComActQuestnaireDO queDO = questnaireDAO.selectOne(subParam);
+ if (queDO == null) {
+ return R.fail();
+ }
+ queDO.setUpdateBy(userId);
queDO.setIsHide(1);
questnaireDAO.updateById(queDO);
return R.ok();
--
Gitblit v1.7.1