add :用户问卷添加 题目选项类型

CeDo

2021-04-13 160145222358a8c56c5ceb14c2b6935ab6a9bb26

add :用户问卷添加 题目选项类型

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java

@@ -7,9 +7,12 @@
import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireAnswerStatVO;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -45,20 +48,20 @@
        return communityService.addQuestnaire(questnaireVO, loginUserInfo.getCommunityId(), loginUserInfo.getUserId());
    }

    @ApiOperation(value = "查看问卷", response = ComActQuestnaireVO.class)
    @ApiOperation(value = "查看问卷", response = UsersAnswerVO.class)
    @GetMapping("/view")
    public R viewQuestnaire(@RequestParam("questId") Long questId) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        return communityService.view(loginUserInfo.getUserId(), questId);
    }

    @ApiOperation(value = "在线统计信息", response = ComActQuestnaireVO.class)
    @ApiOperation(value = "在线统计信息", response = QuestnaireAnswerStatVO.class)
    @GetMapping("/stat")
    public R stat(@RequestParam("questId") Long questId) {
        return communityService.statistics(questId);
    }

    @ApiOperation(value = "在线统计详细", response = ComCvtBusinessVO.class)
    @ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
    @GetMapping("/stat/details")
    public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
        //问卷调查

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaiteSubSelectionVO.java

@@ -20,4 +20,7 @@

    @ApiModelProperty(value = "选项内容")
    private String content;

    @ApiModelProperty(value = "选项类型 0 固定选项 1 自定义选项")
    private Integer type;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java

@@ -35,4 +35,9 @@
     */
    private String optionName;

    /**
     * 选项类型 0 固定选项 1 自定义选项
     */
    private Integer type;

}

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

@@ -31,6 +31,7 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubSelectionVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireSubVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;

@@ -54,6 +55,7 @@
    ComActQuestnaireSubSelectionServiceImpl subSelectionService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
        ComActQuestnaireDO comActQuestnaireDO = new ComActQuestnaireDO();
        comActQuestnaireDO.setTitle(questnaireVO.getQueTitle());
@@ -67,22 +69,27 @@
        comActQuestnaireDO.setForParty(questnaireVO.getForParty());
        comActQuestnaireDO.setForVolunteer(questnaireVO.getForVolunteer());
        int questId = questnaireDAO.insert(comActQuestnaireDO);
        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) questId);
            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((long) subId);
                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);