Merge remote-tracking branch 'origin/master'

CeDo

2021-04-09 df6f59ab492049c78e624d4547164ec81137349e

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

@@ -35,6 +35,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @Author: llming
@@ -78,7 +79,7 @@
            sub.getQuestnaiteSubSelectionVOS().forEach(subSelect -> {
                ComActQuestnaireSubSelectionDO subSelectionDO = new ComActQuestnaireSubSelectionDO();
                subSelectionDO.setQueSubId((long) subId);
                subSelectionDO.setOptionName(subSelect.getOption());
                subSelectionDO.setOptionName(subSelect.getOptionName());
                subSelectionDO.setSort(subSelect.getSort());
                subSelectionDO.setContent(subSelect.getContent());
                subSelectionDO.setCreateBy(userId);
@@ -131,6 +132,7 @@
                    throw new ServiceException("500", "修改问卷题目数据有误！");
                }
                subDO.setContent(sub.getContent());
                //更新问卷题目
                questnaireSubDAO.updateById(subDO);
                sub.getQuestnaiteSubSelectionVOS().forEach(subSelection -> {
                    if (subSelection.getQueSubSelectionId() == null || subSelection.getContent() == null) {
@@ -138,6 +140,7 @@
                    }
                    ComActQuestnaireSubSelectionDO subSelectionDO = questnaireSubSelectionDAO.selectById(subSelection.getQueSubSelectionId());
                    subSelectionDO.setContent(subSelection.getContent());
                    //更新问卷选项
                    questnaireSubSelectionDAO.updateById(subSelectionDO);
                });
            });
@@ -147,8 +150,19 @@
    }

    @Override
    public R deleteQuestnaire() {
        return null;
    public R deleteQuestnaire(Long queId) {
        int queDeleteResult = questnaireDAO.deleteById(queId);
        if (queDeleteResult > 0) {
            LambdaQueryWrapper<ComActQuestnaireSubDO> subParam = new QueryWrapper<ComActQuestnaireSubDO>().lambda();
            subParam.eq(ComActQuestnaireSubDO::getQueId, queId);
            List<Long> subIds = questnaireSubDAO.selectList(subParam).stream().map(ComActQuestnaireSubDO::getId).collect(Collectors.toList());
            int subDeleteResult = questnaireSubDAO.delete(subParam);
            if (subDeleteResult > 0) {
                LambdaQueryWrapper<ComActQuestnaireSubSelectionDO> subSelectParam = new LambdaQueryWrapper<ComActQuestnaireSubSelectionDO>().in(ComActQuestnaireSubSelectionDO::getQueSubId, subIds);
                questnaireSubSelectionDAO.delete(subSelectParam);
            }
        }
        return R.ok();
    }

    @Override