bug fixed: 过滤删除的调查问卷，添加调查问卷 调查对象

CeDo

2021-04-14 d2a5b25d25e8912d3e9e4ae5f9a315c386060f25

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

@@ -71,28 +71,32 @@
        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) comActQuestnaireDO.getId());
            comActQuestnaireSubDO.setCreateBy(userId);
            int subId = questnaireSubDAO.insert(comActQuestnaireSubDO);
        if(questnaireVO.getQuestnaiteSubVOS()!=null) {
            questnaireVO.getQuestnaiteSubVOS().forEach(sub -> {
                ComActQuestnaireSubDO comActQuestnaireSubDO = new ComActQuestnaireSubDO();
                comActQuestnaireSubDO.setType(sub.getType());
                comActQuestnaireSubDO.setContent(sub.getContent());
                comActQuestnaireSubDO.setSort(sub.getSort());
                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(comActQuestnaireSubDO.getId());
                subSelectionDO.setOptionName(subSelect.getOptionName());
                subSelectionDO.setSort(subSelect.getSort());
                subSelectionDO.setContent(subSelect.getContent());
                subSelectionDO.setCreateBy(userId);
                subSelectionDO.setType(subSelect.getType());
                subSelectionList.add(subSelectionDO);
                ArrayList<ComActQuestnaireSubSelectionDO> subSelectionList = Lists.newArrayList();
                if(sub.getQuestnaiteSubSelectionVOS()!=null) {
                    sub.getQuestnaiteSubSelectionVOS().forEach(subSelect -> {
                        ComActQuestnaireSubSelectionDO subSelectionDO = new ComActQuestnaireSubSelectionDO();
                        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);
            });
            subSelectionService.saveBatch(subSelectionList);
        });
        }
        return R.ok();
    }

@@ -110,6 +114,14 @@
        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);
    }