Merge branch 'zzj' of http://182.151.2.19:9380/root/zhihuishequ into zzj

huanghongfa

2021-08-19 29c3367d8c8f9777bde6a86fa26c86d19a35bc07

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

@@ -518,12 +518,13 @@
        Long userId = answerQuestnaireVO.getUserId();
        Long questId = answerQuestnaireVO.getQuestId();
        Date nowDate = new Date();

        ComActQuestnaireDO questnaireDO = questnaireDAO.selectById(questId);
        if (questnaireDO == null) {
            return R.fail("调查问卷不存在！");
        }

        if(questnaireDO.getState().equals(ComActQuestnaireDO.state.dyz)){
        if(!questnaireDO.getState().equals(ComActQuestnaireDO.state.dyz)){
            return R.fail("该调查问卷已结束，不可提交！");
        }