lidongdong
2023-09-04 b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -151,7 +151,7 @@
                        subSelectionDO.setCreateBy(userId);
                        subSelectionDO.setType(subSelect.getType());
                        subSelectionDO.setKey(subSelect.getKey());
                        subSelectionDO.setKey(subSelect.getUrl());
                        subSelectionDO.setUrl(subSelect.getUrl());
                        subSelectionList.add(subSelectionDO);
                    }
                }
@@ -270,6 +270,7 @@
        questnaireDAO.updateById(questnaireDO);
        // 删除原调查问卷题目以及选项,重新进行新增
        questnaireDAO.deleteQuesSubAll(queId);
        questnaireDAO.deleteQuesSubAll2(queId);
        // 重新新增题目以及题目选项
        if (!questnaiteSubVOS.isEmpty()) {
            questnaiteSubVOS.forEach(sub -> {
@@ -341,8 +342,11 @@
        if (queDO == null) {
            return R.fail("未查询到调查问卷记录");
        }
        if (!queDO.getState().equals(ComActQuestnaireDO.state.dfb)) {
            return R.fail("该调查问卷不是待发布状态,不可删除");
//        if (!queDO.getState().equals(ComActQuestnaireDO.state.dfb) ) {
//        return R.fail("该调查问卷不是待发布状态,不可删除");
        if (queDO.getState().equals(ComActQuestnaireDO.state.dyz) ) {
            return R.fail("该调查问卷不是待发布状态或已结束状态,不可删除");
        }
        queDO.setUpdateBy(userId);
        queDO.setUpdateAt(new Date());
@@ -478,12 +482,15 @@
         * 查询题目
         */
        List<ComActQuestnaireSubDO> list = questnaireSubDAO.selectList(
            new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
            new QueryWrapper<ComActQuestnaireSubDO>().lambda()
                    .eq(ComActQuestnaireSubDO::getQueId, questId).orderByAsc(ComActQuestnaireSubDO::getCreateAt));
        List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
        list.forEach(subDo -> {
            ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
            BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
            listSubVo.add(comActQuestnaireSubVO);
            if(!subDo.getType().equals(ComActQuestnaireSubDO.type.describe)){
                ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
                BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
                listSubVo.add(comActQuestnaireSubVO);
            }
        });
        questnaireAnswersDTO.setSubs(listSubVo);
        /**