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 | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 158 insertions(+), 20 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 f0e6d8a..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
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Comparator;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,9 +10,11 @@
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.PageQuestnaireDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.questnaire.AddQuestnaireVO;
+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;
@@ -21,7 +24,14 @@
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 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;
@@ -47,30 +57,34 @@
ComActQuestnaireSubSelectionServiceImpl subSelectionService;
@Override
- public R AddQuestnaire(AddQuestnaireVO addQuestnaireVO, Long communityId, Long userId) {
+ public R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
ComActQuestnaireDO comActQuestnaireDO = new ComActQuestnaireDO();
- comActQuestnaireDO.setTitle(addQuestnaireVO.getQueTitle());
- comActQuestnaireDO.setQueDescribe(addQuestnaireVO.getQueDescribe());
+ comActQuestnaireDO.setTitle(questnaireVO.getQueTitle());
+ comActQuestnaireDO.setQueDescribe(questnaireVO.getQueDescribe());
comActQuestnaireDO.setState(QuestnaireState.CONTINUED.getCode());
comActQuestnaireDO.setJoinCount(0);
comActQuestnaireDO.setCommunityId(communityId);
- comActQuestnaireDO.setCreatBy(userId);
- int questnaireId = questnaireDAO.insert(comActQuestnaireDO);
- addQuestnaireVO.getQuestnaiteSubVOS().forEach(sub -> {
+ comActQuestnaireDO.setCreateBy(userId);
+ 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.setCreatBy(userId);
+ 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.setCreatBy(userId);
+ subSelectionDO.setCreateBy(userId);
subSelectionList.add(subSelectionDO);
});
subSelectionService.saveBatch(subSelectionList);
@@ -79,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());
}
@@ -100,28 +117,149 @@
}
@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 statQuestnaire(Long questId){
+ ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
+
+ QuestnaireAnswerStatVO usersAnswerStatVO = new QuestnaireAnswerStatVO();
+ //问卷信息
+ ComActQuestnaireVO comActQuestnaireVO = new ComActQuestnaireVO();
+ BeanUtils.copyProperties(comActQuestnaireDO, comActQuestnaireVO);
+ usersAnswerStatVO.setQuestnaire(comActQuestnaireVO);
+
+ UsersSubAnswerStatVO usersSubAnswerStatVO = new UsersSubAnswerStatVO();
+
+
+ //questnaireAnswerContentDAO.selectQuestnaireStat(questId);
+
+ 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.selectById(questId);
+ if(comActQuestnaireDO==null){
+ return R.fail("问卷不存在!");
+ }
- List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList =
- questnaireAnswerContentDAO.selectList(new QueryWrapper<ComActQuestnaireAnswerContentDO>().lambda().eq(ComActQuestnaireAnswerContentDO::getUserId, userId).eq(ComActQuestnaireAnswerContentDO::getSubId, questId));
+ UsersAnswerVO usersAnswerVO = new UsersAnswerVO();
+ ComActQuestnaireVO comActQuestnaireVO = new ComActQuestnaireVO();
+ BeanUtils.copyProperties(comActQuestnaireDO, comActQuestnaireVO);
+ usersAnswerVO.setQuestnaire(comActQuestnaireVO);
- return null;
+ List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
+ list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort).reversed());
+ 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);
}
}
--
Gitblit v1.7.1