no
DESKTOP-71BH0QO\L、ming
2021-04-09 78a4c3c826640bb1afd30ee6b1d3b8d1d4c3c3d0
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -1,7 +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;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,6 +12,7 @@
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.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.service_community.dao.ComActQuestnaireAnswerContentDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
@@ -35,7 +35,6 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
 * @Author: llming
@@ -57,7 +56,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());
@@ -65,14 +64,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();
@@ -91,17 +92,17 @@
    }
    @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());
        }
        if (pageQuestnaireDTO.getTitle() != null) {
            lambdaQueryWrapper.eq(ComActQuestnaireDO::getState, pageQuestnaireDTO.getState());
        }
        if (pageQuestnaireDTO.getParterType() != null) {
            lambdaQueryWrapper.eq(ComActQuestnaireDO::getParterType, pageQuestnaireDTO.getParterType());
        }
        if (pageQuestnaireDTO.getEndTime() != null && pageQuestnaireDTO.getStartTime() != null) {
            lambdaQueryWrapper.ge(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getStartTime());
@@ -112,10 +113,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有误!");
            }
@@ -150,9 +151,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();