CeDo
2021-04-14 d363c76c7bbf5deba397291b297ceca3be15f10e
bugfixed
2个文件已修改
48 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
@@ -17,11 +17,11 @@
    private String queTitle;
    @ApiModelProperty(value = "问卷描述")
    private String queDescribe;
    @ApiModelProperty(value = "提供居民", example = "true")
    @ApiModelProperty(value = "提供居民", example = "true", required = true)
    private Boolean forMasses;
    @ApiModelProperty(value = "提供党员", example = "true")
    @ApiModelProperty(value = "提供党员", example = "true", required = true)
    private Boolean forParty;
    @ApiModelProperty(value = "提供志愿者", example = "true")
    @ApiModelProperty(value = "提供志愿者", example = "true", required = true)
    private Boolean forVolunteer;
    @ApiModelProperty(value = "题目")
    private List<QuestnaiteSubVO> questnaiteSubVOS;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -71,28 +71,30 @@
        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();
                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();
    }