修改bug

huanghongfa

2021-05-28 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6

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

@@ -83,16 +83,23 @@

                ArrayList<ComActQuestnaireSubSelectionDO> subSelectionList = Lists.newArrayList();
                if(sub.getQuestnaiteSubSelectionVOS()!=null) {
                    sub.getQuestnaiteSubSelectionVOS().forEach(subSelect -> {
                    List<QuestnaiteSubSelectionVO> l = sub.getQuestnaiteSubSelectionVOS();
                    for(int i=0; i<l.size(); i++){
                        QuestnaiteSubSelectionVO subSelect = l.get(i);
                        ComActQuestnaireSubSelectionDO subSelectionDO = new ComActQuestnaireSubSelectionDO();
                        subSelectionDO.setQueSubId(comActQuestnaireSubDO.getId());
                        subSelectionDO.setOptionName(subSelect.getOptionName());
                        if(subSelect.getType()==1){
                            //添加选项名称
                            subSelectionDO.setOptionName(subSelect.getOptionName());
                        }else {
                            subSelectionDO.setOptionName(String.valueOf(Character.toChars('A' + i)));
                        }
                        subSelectionDO.setSort(subSelect.getSort());
                        subSelectionDO.setContent(subSelect.getContent());
                        subSelectionDO.setCreateBy(userId);
                        subSelectionDO.setType(subSelect.getType());
                        subSelectionList.add(subSelectionDO);
                    });
                    }
                }
                subSelectionService.saveBatch(subSelectionList);
            });
@@ -224,7 +231,8 @@
            usersSubAnswerStatVO.setTotal(0);

            usearSubAnswerSelectionStatVOList.forEach(stat -> {
                if (stat.getSubId() == comActQuestnaireSubDO.getId()) {
                if (stat.getSubId().equals(comActQuestnaireSubDO.getId())
                        && stat.getTotal()>0) {
                    userSubAnswerSelectionStatVOList.add(stat);
                }
            });
@@ -342,6 +350,12 @@

    @Override
    public R pageQuestnaireAnswer(PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO) {
        if(pageQuestnaireAnswerDTO.getPageNum()==null||pageQuestnaireAnswerDTO.getPageNum().longValue()==0){
            pageQuestnaireAnswerDTO.setPageNum(1l);
        }
        if(pageQuestnaireAnswerDTO.getPageSize()==null||pageQuestnaireAnswerDTO.getPageSize().longValue()==0){
            pageQuestnaireAnswerDTO.setPageSize(10l);
        }
        Page userPage = new Page(pageQuestnaireAnswerDTO.getPageNum(), pageQuestnaireAnswerDTO.getPageSize());
        IPage<ComActQuestnaireAnswerContentVO> doPager = questnaireAnswerContentDAO.selectAnswersByPage(userPage, pageQuestnaireAnswerDTO);
        return R.ok(doPager);