fix:调查问卷删除改为隐藏

DESKTOP-71BH0QO\L、ming

2021-04-09 1093d2192a892aa9248b5233eda1a08045695aa3

fix:调查问卷删除改为隐藏

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java

@@ -43,4 +43,9 @@
     */
    private Integer parterType;

    /**
     * 是否隐藏显示 0 显示 1 隐藏
     */
    private Integer isHide;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java

@@ -28,7 +28,7 @@
    R editQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId);

    /**
     * 删除问卷
     * 删除问卷  ——隐藏
     * @param queId 问卷调查ID
     * @return
     */

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java

@@ -151,22 +151,15 @@

    @Override
    public R deleteQuestnaire(Long queId) {
        int queDeleteResult = questnaireDAO.deleteById(queId);
        if (queDeleteResult > 0) {
            LambdaQueryWrapper<ComActQuestnaireSubDO> subParam = new QueryWrapper<ComActQuestnaireSubDO>().lambda();
            subParam.eq(ComActQuestnaireSubDO::getQueId, queId);
            List<Long> subIds = questnaireSubDAO.selectList(subParam).stream().map(ComActQuestnaireSubDO::getId).collect(Collectors.toList());
            int subDeleteResult = questnaireSubDAO.delete(subParam);
            if (subDeleteResult > 0) {
                LambdaQueryWrapper<ComActQuestnaireSubSelectionDO> subSelectParam = new LambdaQueryWrapper<ComActQuestnaireSubSelectionDO>().in(ComActQuestnaireSubSelectionDO::getQueSubId, subIds);
                questnaireSubSelectionDAO.delete(subSelectParam);
            }
        }
        LambdaQueryWrapper<ComActQuestnaireDO> subParam = new LambdaQueryWrapper<ComActQuestnaireDO>().eq(ComActQuestnaireDO::getId, queId);
        ComActQuestnaireDO queDO = questnaireDAO.selectOne(subParam);
        queDO.setIsHide(1);
        questnaireDAO.updateById(queDO);
        return R.ok();
    }

    @Override
    public R statQuestnaire(Long questId){
    public R statQuestnaire(Long questId) {
        return null;
    }

@@ -179,8 +172,8 @@
    public R answerInfoQuestnaire(Long userId, Long questId) {

        ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectById(questId);
        if(comActQuestnaireDO==null){
            return  R.fail("问卷不存在!");
        if (comActQuestnaireDO == null) {
            return R.fail("问卷不存在!");
        }

        UsersAnswerVO usersAnswerVO = new UsersAnswerVO();
@@ -192,7 +185,7 @@
        list.sort(Comparator.comparing(ComActQuestnaireSubDO::getSort).reversed());
        List<UsersSubAnswerVO> usersSubAnswerVOList = new ArrayList<>();

        list.forEach(comActQuestnaireSubDO ->{
        list.forEach(comActQuestnaireSubDO -> {
                    UsersSubAnswerVO usersSubAnswerVO = new UsersSubAnswerVO();
                    //问卷调查题目
                    ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
@@ -218,7 +211,7 @@
                                    .eq(ComActQuestnaireAnswerContentDO::getSubId, subId));

                    List<ComActQuestnaireAnswerContentVO> questnaireAnswerContentVOList = new ArrayList<>();
                    questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO->{
                    questnaireAnswerContentDOList.forEach(questnaireAnswerContentDO -> {
                        ComActQuestnaireAnswerContentVO comActQuestnaireSubSelectionVO = new ComActQuestnaireAnswerContentVO();
                        BeanUtils.copyProperties(questnaireAnswerContentDO, comActQuestnaireSubSelectionVO);
                        questnaireAnswerContentVOList.add(comActQuestnaireSubSelectionVO);