From 2b31c465fe201d378c35d0711b1ce0337f194914 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 14 四月 2021 09:55:36 +0800
Subject: [PATCH] 社区后台去掉用户社区限制
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 118 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 79 insertions(+), 39 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 b9e3c05..ff6dfb4 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,6 +1,7 @@
package com.panzhihua.service_community.service.impl;
import java.util.*;
+import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,14 +17,8 @@
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;
@@ -31,6 +26,7 @@
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;
@@ -45,6 +41,8 @@
@Resource
ComActQuestnaireSubDAO questnaireSubDAO;
@Resource
+ ComActDynUserDAO userDAO;
+ @Resource
ComActQuestnaireSubSelectionDAO questnaireSubSelectionDAO;
@Resource
ComActQuestnaireAnswerContentDAO questnaireAnswerContentDAO;
@@ -52,8 +50,11 @@
ComActQuestnaireSubServiceImpl questnaireSubService;
@Resource
ComActQuestnaireSubSelectionServiceImpl subSelectionService;
+ @Resource
+ ComActQuestnaireAnswerContentServiceImpl answerContentService;
@Override
+ @Transactional(rollbackFor = Exception.class)
public R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
ComActQuestnaireDO comActQuestnaireDO = new ComActQuestnaireDO();
comActQuestnaireDO.setTitle(questnaireVO.getQueTitle());
@@ -67,22 +68,27 @@
comActQuestnaireDO.setForParty(questnaireVO.getForParty());
comActQuestnaireDO.setForVolunteer(questnaireVO.getForVolunteer());
int questId = questnaireDAO.insert(comActQuestnaireDO);
+ if(questId!=1){
+ return R.fail("创建失败");
+ }
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.setQueId((long) comActQuestnaireDO.getId());
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.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);
@@ -92,23 +98,27 @@
@Override
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());
+ 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.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
@@ -176,7 +186,7 @@
}
@Override
- public R statQuestnaire(Long 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();
@@ -193,7 +203,7 @@
List<UsersSubAnswerStatVO> usersSubAnswerStatVOList = new ArrayList<>();
- comActQuestnaireSubDOList.forEach(comActQuestnaireSubDO->{
+ comActQuestnaireSubDOList.forEach(comActQuestnaireSubDO -> {
UsersSubAnswerStatVO usersSubAnswerStatVO = new UsersSubAnswerStatVO();
ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
@@ -203,13 +213,15 @@
List<UserSubAnswerSelectionStatVO> userSubAnswerSelectionStatVOList = new ArrayList<>();
usersSubAnswerStatVO.setTotal(0);
- usearSubAnswerSelectionStatVOList.forEach(stat ->{
- if(stat.getSubId()==comActQuestnaireSubDO.getId()){
+ 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()));
+ 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);
});
@@ -225,8 +237,8 @@
@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("问卷不存在!");
+ if (comActQuestnaireDO == null) {
+ return R.fail("问卷不存在!");
}
UsersAnswerVO usersAnswerVO = new UsersAnswerVO();
@@ -238,7 +250,7 @@
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();
@@ -259,7 +271,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));
@@ -289,7 +301,7 @@
*/
List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
- list.forEach(subDo->{
+ list.forEach(subDo -> {
ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
listSubVo.add(comActQuestnaireSubVO);
@@ -300,7 +312,7 @@
*/
List<ComActQuestnaireAnswerContentDO> questnaireAnswerContentDOList = questnaireAnswerContentDAO.selectListByQuestnaire(questId);
List<ComActQuestnaireAnswerContentVO> vos = new ArrayList<>();
- questnaireAnswerContentDOList.forEach(dos ->{
+ questnaireAnswerContentDOList.forEach(dos -> {
ComActQuestnaireAnswerContentVO vo = new ComActQuestnaireAnswerContentVO();
BeanUtils.copyProperties(dos, vo);
vos.add(vo);
@@ -313,9 +325,8 @@
@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()));
+ IPage<ComActQuestnaireAnswerContentVO> doPager =
+ questnaireAnswerContentDAO.selectVoByPage(userPage, pageQuestnaireSubDetailsDTO);
return R.ok(doPager);
}
@@ -325,4 +336,33 @@
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