From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +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 | 310 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 298 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 4e4aab7..b9e3c05 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,8 +1,38 @@
package com.panzhihua.service_community.service.impl;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.service.ComActQuestnaireService;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
+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 javax.annotation.Resource;
/**
* @Author: llming
@@ -10,33 +40,289 @@
*/
@Service
public class ComActQuestnaireServiceImpl implements ComActQuestnaireService {
+ @Resource
+ ComActQuestnaireDAO questnaireDAO;
+ @Resource
+ ComActQuestnaireSubDAO questnaireSubDAO;
+ @Resource
+ ComActQuestnaireSubSelectionDAO questnaireSubSelectionDAO;
+ @Resource
+ ComActQuestnaireAnswerContentDAO questnaireAnswerContentDAO;
+ @Resource
+ ComActQuestnaireSubServiceImpl questnaireSubService;
+ @Resource
+ ComActQuestnaireSubSelectionServiceImpl subSelectionService;
+
@Override
- public R AddQuestnaire() {
- return null;
+ public R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
+ ComActQuestnaireDO comActQuestnaireDO = new ComActQuestnaireDO();
+ comActQuestnaireDO.setTitle(questnaireVO.getQueTitle());
+ comActQuestnaireDO.setQueDescribe(questnaireVO.getQueDescribe());
+ comActQuestnaireDO.setState(QuestnaireState.CONTINUED.getCode());
+ comActQuestnaireDO.setJoinCount(0);
+ comActQuestnaireDO.setCommunityId(communityId);
+ comActQuestnaireDO.setCreateBy(userId);
+ comActQuestnaireDO.setIsHide(0);
+ 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) questId);
+ 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);
+ });
+ subSelectionService.saveBatch(subSelectionList);
+ });
+ return R.ok();
}
@Override
- public R ListQuestnaire() {
- return null;
+ public R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO, Long communityId) {
+ Page userPage = new Page(pageQuestnaireDTO.getPageNum(), pageQuestnaireDTO.getPageSize());
+ LambdaQueryWrapper<ComActQuestnaireDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(ComActQuestnaireDO::getCommunityId, communityId);
+ //过滤隐藏字段
+ lambdaQueryWrapper.eq(ComActQuestnaireDO::getIsHide, 0);
+ if (pageQuestnaireDTO.getTitle() != null) {
+ lambdaQueryWrapper.like(ComActQuestnaireDO::getTitle, pageQuestnaireDTO.getTitle());
+ }
+ if (pageQuestnaireDTO.getTitle() != null) {
+ lambdaQueryWrapper.eq(ComActQuestnaireDO::getState, pageQuestnaireDTO.getState());
+ }
+ 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);
}
@Override
- public R editQuestnaire() {
- return null;
+ public R editQuestnaire(QuestnaireVO questnaireVO) {
+ ComActQuestnaireDO questnaireDO = null;
+ if (questnaireVO.getQuestId() != null && questnaireVO.getQuestId() != 0L) {
+ questnaireDO = questnaireDAO.selectById(questnaireVO.getQuestId());
+ if (questnaireDO == null) {
+ return R.fail(500, "id有误！");
+ }
+ questnaireDO.setTitle(questnaireDO.getTitle());
+ questnaireDO.setQueDescribe(questnaireDO.getQueDescribe());
+ //保存问卷调查
+ questnaireDAO.updateById(questnaireDO);
+ questnaireVO.getQuestnaiteSubVOS().forEach(sub -> {
+ if (sub.getQueSubId() == null) {
+ throw new ServiceException("500", "问卷题目Id为空！");
+ }
+ ComActQuestnaireSubDO subDO = questnaireSubDAO.selectById(sub.getQueSubId());
+ if (subDO == null || sub.getContent() == null) {
+ throw new ServiceException("500", "修改问卷题目数据有误！");
+ }
+ subDO.setContent(sub.getContent());
+ //更新问卷题目
+ questnaireSubDAO.updateById(subDO);
+ sub.getQuestnaiteSubSelectionVOS().forEach(subSelection -> {
+ if (subSelection.getQueSubSelectionId() == null || subSelection.getContent() == null) {
+ throw new ServiceException("500", "问卷题目选项数据有误！");
+ }
+ ComActQuestnaireSubSelectionDO subSelectionDO = questnaireSubSelectionDAO.selectById(subSelection.getQueSubSelectionId());
+ subSelectionDO.setContent(subSelection.getContent());
+ //更新问卷选项
+ questnaireSubSelectionDAO.updateById(subSelectionDO);
+ });
+ });
+
+ }
+ return R.ok();
}
@Override
- public R deleteQuestnaire() {
- return null;
+ 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 infoQuestnaire() {
- return null;
+ 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 answerInfoQuestnaire() {
- return null;
+ 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();
+ //问卷信息
+ ComActQuestnaireVO comActQuestnaireVO = new ComActQuestnaireVO();
+ BeanUtils.copyProperties(comActQuestnaireDO, comActQuestnaireVO);
+ usersAnswerStatVO.setQuestnaire(comActQuestnaireVO);
+
+ //问卷题目列表
+ List<ComActQuestnaireSubDO> comActQuestnaireSubDOList =
+ questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
+ //题目统计信息
+ List<UserSubAnswerSelectionStatVO> usearSubAnswerSelectionStatVOList = questnaireAnswerContentDAO.selectQuestnaireStat(questId);
+
+ List<UsersSubAnswerStatVO> usersSubAnswerStatVOList = new ArrayList<>();
+
+ 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);
+ }
+
+ @Override
+ public R infoQuestnaire(Long questId) {
+ return answerInfoQuestnaire(null, questId);
+ }
+
+ @Override
+ public R answerInfoQuestnaire(Long userId, Long questId) {
+ 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();
+ ComActQuestnaireVO comActQuestnaireVO = new ComActQuestnaireVO();
+ BeanUtils.copyProperties(comActQuestnaireDO, comActQuestnaireVO);
+ usersAnswerVO.setQuestnaire(comActQuestnaireVO);
+
+ List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
+ list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort));
+ List<UsersSubAnswerVO> usersSubAnswerVOList = new ArrayList<>();
+
+ list.forEach(comActQuestnaireSubDO ->{
+ UsersSubAnswerVO usersSubAnswerVO = new UsersSubAnswerVO();
+ //问卷调查题目
+ ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
+ BeanUtils.copyProperties(comActQuestnaireSubDO, comActQuestnaireSubVO);
+ usersSubAnswerVO.setQuestSubVO(comActQuestnaireSubVO);
+
+ //问卷调查题目-选项
+ Long subId = comActQuestnaireSubDO.getId();
+ List<ComActQuestnaireSubSelectionDO> comActQuestnaireSubSelectionDOs =
+ questnaireSubSelectionDAO.selectList(new QueryWrapper<ComActQuestnaireSubSelectionDO>().lambda().eq(ComActQuestnaireSubSelectionDO::getQueSubId, subId));
+
+
+ List<ComActQuestnaireSubSelectionVO> comActQuestnaireSubSelectionVOs = new ArrayList<>();
+ comActQuestnaireSubSelectionDOs.forEach(comActQuestnaireSubSelectionDO -> {
+ ComActQuestnaireSubSelectionVO comActQuestnaireSubSelectionVO = new ComActQuestnaireSubSelectionVO();
+ BeanUtils.copyProperties(comActQuestnaireSubSelectionDO, comActQuestnaireSubSelectionVO);
+ comActQuestnaireSubSelectionVOs.add(comActQuestnaireSubSelectionVO);
+ });
+ usersSubAnswerVO.setQuestSelectionList(comActQuestnaireSubSelectionVOs);
+ //用户回答
+ if(userId!=null) {
+ List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
+ questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId)
+ .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));
+
+ List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentVOList = new ArrayList<>();
+ questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO -> {
+ ComActQuestnaireAnswerContentVO comActQuestnaireSubSelectionVO = new ComActQuestnaireAnswerContentVO();
+ BeanUtils.copyProperties(questnaireAnswerContentDO, comActQuestnaireSubSelectionVO);
+ questnaireAnswerContentVOList.add(comActQuestnaireSubSelectionVO);
+ });
+
+ usersSubAnswerVO.setUsersAnswer(questnaireAnswerContentVOList);
+ }
+ usersSubAnswerVOList.add(usersSubAnswerVO);
+ }
+ );
+ usersAnswerVO.setUsersSubAnswer(usersSubAnswerVOList);
+
+ 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<ComActQuestnaireAnswerContentDO> doPager =
+ questnaireAnswerContentDAO.selectPage(userPage, new QueryWrapper<ComActQuestnaireAnswerContentDO>()
+ .orderBy(true, true, "create_at").lambda().eq(ComActQuestnaireAnswerContentDO::getSubId, pageQuestnaireSubDetailsDTO.getSubId()));
+ 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);
}
}
--
Gitblit v1.7.1