From d2a5b25d25e8912d3e9e4ae5f9a315c386060f25 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 14 四月 2021 11:31:33 +0800
Subject: [PATCH] bug fixed: 过滤删除的调查问卷，添加调查问卷 调查对象
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 265 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 198 insertions(+), 67 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..305b166 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
@@ -1,7 +1,7 @@
package com.panzhihua.service_community.service.impl;
-import java.util.Comparator;
-import java.util.Date;
+import java.util.*;
+import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,17 +11,14 @@
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.QuestnaireState;
import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
+import com.panzhihua.common.model.dtos.community.QuestnaireAnswersDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.questnaire.*;
-import com.panzhihua.service_community.dao.ComActQuestnaireAnswerContentDAO;
-import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
-import com.panzhihua.service_community.dao.ComActQuestnaireSubDAO;
-import com.panzhihua.service_community.dao.ComActQuestnaireSubSelectionDAO;
-import com.panzhihua.service_community.model.dos.ComActQuestnaireAnswerContentDO;
-import com.panzhihua.service_community.model.dos.ComActQuestnaireDO;
-import com.panzhihua.service_community.model.dos.ComActQuestnaireSubDO;
-import com.panzhihua.service_community.model.dos.ComActQuestnaireSubSelectionDO;
+import com.panzhihua.service_community.dao.*;
+import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActQuestnaireService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -29,11 +26,9 @@
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 org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
/**
* @Author: llming
@@ -46,6 +41,8 @@
@Resource
ComActQuestnaireSubDAO questnaireSubDAO;
@Resource
+ ComActDynUserDAO userDAO;
+ @Resource
ComActQuestnaireSubSelectionDAO questnaireSubSelectionDAO;
@Resource
ComActQuestnaireAnswerContentDAO questnaireAnswerContentDAO;
@@ -53,9 +50,12 @@
ComActQuestnaireSubServiceImpl questnaireSubService;
@Resource
ComActQuestnaireSubSelectionServiceImpl subSelectionService;
+ @Resource
+ ComActQuestnaireAnswerContentServiceImpl answerContentService;
@Override
- public R AddQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
+ @Transactional(rollbackFor = Exception.class)
+ public R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
ComActQuestnaireDO comActQuestnaireDO = new ComActQuestnaireDO();
comActQuestnaireDO.setTitle(questnaireVO.getQueTitle());
comActQuestnaireDO.setQueDescribe(questnaireVO.getQueDescribe());
@@ -63,57 +63,73 @@
comActQuestnaireDO.setJoinCount(0);
comActQuestnaireDO.setCommunityId(communityId);
comActQuestnaireDO.setCreateBy(userId);
- comActQuestnaireDO.setParterType(questnaireVO.getParterType());
- int questnaireId = 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.setCreateBy(userId);
- int subId = questnaireSubDAO.insert(comActQuestnaireSubDO);
- ArrayList<ComActQuestnaireSubSelectionDO> subSelectionList = Lists.newArrayList();
- sub.getQuestnaiteSubSelectionVOS().forEach(subSelect -> {
- ComActQuestnaireSubSelectionDO subSelectionDO = new ComActQuestnaireSubSelectionDO();
- subSelectionDO.setQueSubId((long) subId);
- subSelectionDO.setOptionName(subSelect.getOptionName());
- subSelectionDO.setSort(subSelect.getSort());
- subSelectionDO.setContent(subSelect.getContent());
- subSelectionDO.setCreateBy(userId);
- subSelectionList.add(subSelectionDO);
+ comActQuestnaireDO.setIsHide(0);
+ comActQuestnaireDO.setForMasses(questnaireVO.getForMasses());
+ comActQuestnaireDO.setForParty(questnaireVO.getForParty());
+ comActQuestnaireDO.setForVolunteer(questnaireVO.getForVolunteer());
+ int questId = questnaireDAO.insert(comActQuestnaireDO);
+ if(questId!=1){
+ return R.fail("创建失败");
+ }
+ if(questnaireVO.getQuestnaiteSubVOS()!=null) {
+ questnaireVO.getQuestnaiteSubVOS().forEach(sub -> {
+ ComActQuestnaireSubDO comActQuestnaireSubDO = new ComActQuestnaireSubDO();
+ comActQuestnaireSubDO.setType(sub.getType());
+ comActQuestnaireSubDO.setContent(sub.getContent());
+ comActQuestnaireSubDO.setSort(sub.getSort());
+ comActQuestnaireSubDO.setQueId((long) comActQuestnaireDO.getId());
+ comActQuestnaireSubDO.setCreateBy(userId);
+ int subId = questnaireSubDAO.insert(comActQuestnaireSubDO);
+
+ ArrayList<ComActQuestnaireSubSelectionDO> subSelectionList = Lists.newArrayList();
+ if(sub.getQuestnaiteSubSelectionVOS()!=null) {
+ sub.getQuestnaiteSubSelectionVOS().forEach(subSelect -> {
+ ComActQuestnaireSubSelectionDO subSelectionDO = new ComActQuestnaireSubSelectionDO();
+ subSelectionDO.setQueSubId(comActQuestnaireSubDO.getId());
+ subSelectionDO.setOptionName(subSelect.getOptionName());
+ subSelectionDO.setSort(subSelect.getSort());
+ subSelectionDO.setContent(subSelect.getContent());
+ subSelectionDO.setCreateBy(userId);
+ subSelectionDO.setType(subSelect.getType());
+ subSelectionList.add(subSelectionDO);
+ });
+ }
+ subSelectionService.saveBatch(subSelectionList);
});
- subSelectionService.saveBatch(subSelectionList);
- });
+ }
return R.ok();
}
@Override
- public R PageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) {
- Page userPage = new Page(pageQuestnaireDTO.getPageNum(), pageQuestnaireDTO.getPageSize());
- LambdaQueryWrapper<ComActQuestnaireDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
- if (pageQuestnaireDTO.getTitle() != null) {
- lambdaQueryWrapper.like(ComActQuestnaireDO::getTitle, pageQuestnaireDTO.getTitle());
+ public R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO, Long communityId) {
+ Page page = new Page<>();
+ Long pageNum = pageQuestnaireDTO.getPageNum();
+ Long pageSize = pageQuestnaireDTO.getPageSize();
+ if (null == pageNum || 0 == pageNum) {
+ pageNum = 1l;
}
- if (pageQuestnaireDTO.getTitle() != null) {
- lambdaQueryWrapper.eq(ComActQuestnaireDO::getState, pageQuestnaireDTO.getState());
+ if (null == pageSize || 0 == pageSize) {
+ pageSize = 10l;
}
- if (pageQuestnaireDTO.getParterType() != null) {
- lambdaQueryWrapper.eq(ComActQuestnaireDO::getParterType, pageQuestnaireDTO.getParterType());
- }
- if (pageQuestnaireDTO.getEndTime() != null && pageQuestnaireDTO.getStartTime() != null) {
- lambdaQueryWrapper.ge(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getStartTime());
- lambdaQueryWrapper.lt(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getEndTime());
- }
- IPage<ComActQuestnaireDO> doPager = questnaireDAO.selectPage(userPage, lambdaQueryWrapper.orderByDesc(ComActQuestnaireDO::getCreateAt));
- return R.ok(doPager);
+ page.setSize(pageSize);
+ page.setCurrent(pageNum);
+ IPage<QuestnaireListVo> voPage = questnaireDAO.selectPageList(page,pageQuestnaireDTO,communityId);
+ voPage.getRecords().forEach(record -> {
+ Integer userAnswerCount = questnaireAnswerContentDAO.selectUserCountByQuestnaireId(record.getId(), pageQuestnaireDTO.getUserId());
+ if(userAnswerCount>0){
+ record.setAnswer(true);
+ }else{
+ record.setAnswer(false);
+ }
+ });
+ return R.ok(voPage);
}
@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,17 +164,34 @@
}
@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();
}
@Override
- public R statQuestnaire(Long questId){
- ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
+ public R statQuestnaire(Long questId) {
+ ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>().lambda().eq(ComActQuestnaireDO::getId, questId).eq(ComActQuestnaireDO::getIsHide, 0));
QuestnaireAnswerStatVO usersAnswerStatVO = new QuestnaireAnswerStatVO();
//问卷信息
@@ -166,11 +199,37 @@
BeanUtils.copyProperties(comActQuestnaireDO, comActQuestnaireVO);
usersAnswerStatVO.setQuestnaire(comActQuestnaireVO);
- UsersSubAnswerStatVO usersSubAnswerStatVO = new UsersSubAnswerStatVO();
+ //问卷题目列表
+ List<ComActQuestnaireSubDO> comActQuestnaireSubDOList =
+ questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
+ //题目统计信息
+ List<UserSubAnswerSelectionStatVO> usearSubAnswerSelectionStatVOList = questnaireAnswerContentDAO.selectQuestnaireStat(questId);
+ List<UsersSubAnswerStatVO> usersSubAnswerStatVOList = new ArrayList<>();
- //questnaireAnswerContentDAO.selectQuestnaireStat(questId);
+ comActQuestnaireSubDOList.forEach(comActQuestnaireSubDO -> {
+ UsersSubAnswerStatVO usersSubAnswerStatVO = new UsersSubAnswerStatVO();
+ ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
+ BeanUtils.copyProperties(comActQuestnaireSubDO, comActQuestnaireSubVO);
+ usersSubAnswerStatVO.setQuestSubVO(comActQuestnaireSubVO);
+
+ List<UserSubAnswerSelectionStatVO> userSubAnswerSelectionStatVOList = new ArrayList<>();
+ usersSubAnswerStatVO.setTotal(0);
+
+ usearSubAnswerSelectionStatVOList.forEach(stat -> {
+ if (stat.getSubId() == comActQuestnaireSubDO.getId()) {
+ userSubAnswerSelectionStatVOList.add(stat);
+ }
+ });
+ usersSubAnswerStatVO.setUsersAnswer(userSubAnswerSelectionStatVOList);
+ Integer count = questnaireAnswerContentDAO.selectCount(new QueryWrapper<ComActQuestnaireAnswerContentDO>()
+ .select(" DISTINCT sub_id, user_id ").lambda()
+ .eq(ComActQuestnaireAnswerContentDO::getSubId, comActQuestnaireSubDO.getId()));
+ usersSubAnswerStatVO.setTotal(count);
+ usersSubAnswerStatVOList.add(usersSubAnswerStatVO);
+ });
+ usersAnswerStatVO.setUsersSubAnswerStat(usersSubAnswerStatVOList);
return R.ok(usersAnswerStatVO);
}
@@ -181,10 +240,9 @@
@Override
public R answerInfoQuestnaire(Long userId, Long questId) {
-
- ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
- if(comActQuestnaireDO==null){
- return R.fail("问卷不存在!");
+ ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>().lambda().eq(ComActQuestnaireDO::getId, questId).eq(ComActQuestnaireDO::getIsHide, 0));
+ if (comActQuestnaireDO == null) {
+ return R.fail("问卷不存在!");
}
UsersAnswerVO usersAnswerVO = new UsersAnswerVO();
@@ -193,10 +251,10 @@
usersAnswerVO.setQuestnaire(comActQuestnaireVO);
List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
- list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort).reversed());
+ list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort));
List<UsersSubAnswerVO> usersSubAnswerVOList = new ArrayList<>();
- list.forEach(comActQuestnaireSubDO ->{
+ list.forEach(comActQuestnaireSubDO -> {
UsersSubAnswerVO usersSubAnswerVO = new UsersSubAnswerVO();
//问卷调查题目
ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
@@ -217,7 +275,7 @@
});
usersSubAnswerVO.setQuestSelectionList(comActQuestnaireSubSelectionVOs);
//用户回答
- if(userId!=null) {
+ if (userId != null) {
List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId)
.eq(ComActQuestnaireAnswerContentDO::getSubId, subId));
@@ -238,4 +296,77 @@
return R.ok(usersAnswerVO);
}
+
+ @Override
+ public R answerResultList(Long questId) {
+ QuestnaireAnswersDTO questnaireAnswersDTO = new QuestnaireAnswersDTO();
+ /**
+ * 查询题目
+ */
+ List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
+ List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
+ list.forEach(subDo -> {
+ ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
+ BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
+ listSubVo.add(comActQuestnaireSubVO);
+ });
+ questnaireAnswersDTO.setSubs(listSubVo);
+ /**
+ * 查询用户回答
+ */
+ List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList = questnaireAnswerContentDAO.selectListByQuestnaire(questId);
+ List<ComActQuestnaireAnswerContentVO> vos = new ArrayList<>();
+ questnaireAnswerContentDOList.forEach(dos -> {
+ ComActQuestnaireAnswerContentVO vo = new ComActQuestnaireAnswerContentVO();
+ BeanUtils.copyProperties(dos, vo);
+ vos.add(vo);
+ });
+ questnaireAnswersDTO.setAnswers(vos);
+
+ return R.ok(questnaireAnswersDTO);
+ }
+
+ @Override
+ public R qaQeustDetails(PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
+ Page userPage = new Page(pageQuestnaireSubDetailsDTO.getPageNum(), pageQuestnaireSubDetailsDTO.getPageSize());
+ IPage<ComActQuestnaireAnswerContentVO> doPager =
+ questnaireAnswerContentDAO.selectVoByPage(userPage, pageQuestnaireSubDetailsDTO);
+ return R.ok(doPager);
+ }
+
+ @Override
+ public R pageQuestnaireAnswer(PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO) {
+ Page userPage = new Page(pageQuestnaireAnswerDTO.getPageNum(), pageQuestnaireAnswerDTO.getPageSize());
+ IPage<ComActQuestnaireAnswerContentVO> doPager = questnaireAnswerContentDAO.selectAnswersByPage(userPage, pageQuestnaireAnswerDTO);
+ return R.ok(doPager);
+ }
+
+ @Override
+ public R usersAnsweQuestnaire(UsersAnswerQuestnaireVO answerQuestnaireVO, Long userId) {
+ if (answerQuestnaireVO == null || answerQuestnaireVO.getAnswerContentVOList() == null) {
+ return R.fail(500, "数据为空！");
+ }
+ ComActQuestnaireDO questnaireDO = questnaireDAO.selectById(answerQuestnaireVO.getQuestId());
+ if (questnaireDO == null) {
+ return R.fail(500, "调查问卷不存在！");
+ }
+ LambdaQueryWrapper<ComActQuestnaireSubDO> subQuery = new LambdaQueryWrapper<ComActQuestnaireSubDO>();
+ subQuery.eq(ComActQuestnaireSubDO::getQueId,answerQuestnaireVO.getQuestId());
+ List<ComActQuestnaireSubDO> subDOS = questnaireSubDAO.selectList(subQuery);
+ List<Long> subIds = subDOS.stream().map(ComActQuestnaireSubDO::getId).collect(Collectors.toList());
+ List<UserAnswerContentVO> answerContentVOList = answerQuestnaireVO.getAnswerContentVOList();
+ List<ComActQuestnaireAnswerContentDO> answerContentDOList = Lists.newArrayList();
+ for (UserAnswerContentVO answerContent:answerContentVOList) {
+ ComActQuestnaireAnswerContentDO answerContentDO = new ComActQuestnaireAnswerContentDO();
+ boolean b = subIds.stream().anyMatch(a -> a.equals(answerContent.getSubId()));
+ if (!b) {
+ throw new ServiceException("500", "调查问卷题目不存在！");
+ }
+ BeanUtils.copyProperties(answerContent,answerContentDO);
+ answerContentDO.setUserId(userId);
+ answerContentDOList.add(answerContentDO);
+ }
+ answerContentService.saveBatch(answerContentDOList);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1