From de91c84954157bb9f8b6d938cbe0b1b51fb6e65d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 07 五月 2021 15:23:57 +0800
Subject: [PATCH] bugfixed：新增便民服务商家 报错
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
index 305b166..e82ea64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
+++ b/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);
});
@@ -133,8 +140,8 @@
if (questnaireDO == null) {
return R.fail(500, "id有误！");
}
- questnaireDO.setTitle(questnaireDO.getTitle());
- questnaireDO.setQueDescribe(questnaireDO.getQueDescribe());
+ questnaireDO.setTitle(questnaireVO.getQueTitle());
+ questnaireDO.setQueDescribe(questnaireVO.getQueDescribe());
//保存问卷调查
questnaireDAO.updateById(questnaireDO);
questnaireVO.getQuestnaiteSubVOS().forEach(sub -> {
@@ -159,6 +166,8 @@
});
});
+ }else{
+ return R.fail("参数有误");
}
return R.ok();
}
@@ -193,6 +202,10 @@
public R statQuestnaire(Long questId) {
ComActQuestnaireDO comActQuestnaireDO = questnaireDAO.selectOne(new QueryWrapper<ComActQuestnaireDO>().lambda().eq(ComActQuestnaireDO::getId, questId).eq(ComActQuestnaireDO::getIsHide, 0));
+ if(comActQuestnaireDO==null){
+ return R.fail("问卷已删除!");
+ }
+
QuestnaireAnswerStatVO usersAnswerStatVO = new QuestnaireAnswerStatVO();
//问卷信息
ComActQuestnaireVO comActQuestnaireVO = new ComActQuestnaireVO();
@@ -218,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);
}
});
@@ -336,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);
@@ -366,7 +386,15 @@
answerContentDO.setUserId(userId);
answerContentDOList.add(answerContentDO);
}
- answerContentService.saveBatch(answerContentDOList);
+ boolean batchAddSuccess = answerContentService.saveBatch(answerContentDOList);
+ if(batchAddSuccess) {
+ /**
+ * 更新回答用户数量
+ */
+ Integer joinCount = questnaireDO.getJoinCount();
+ questnaireDO.setJoinCount(joinCount != null ? joinCount + 1 : 1);
+ questnaireDAO.updateById(questnaireDO);
+ }
return R.ok();
}
}
--
Gitblit v1.7.1