From a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 15:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java | 10 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 48 ++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java | 48 ++++++++++++----
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java | 14 +++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java | 20 +++++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/EditComActQuestnaireVo.java | 16 +++++
7 files changed, 134 insertions(+), 24 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
index 5bb7401..7a530b5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
@@ -17,8 +17,6 @@
private String title;
@ApiModelProperty(value = "状态 0 调研中 1已停止")
private Integer state;
- @ApiModelProperty(value = "问卷参与者类型 0 全部 1 志愿者 2 党员")
- private Integer parterType;
@ApiModelProperty(value = "发布开始时间")
private Date startTime;
@ApiModelProperty(value = "发布结束时间")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/EditComActQuestnaireVo.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/EditComActQuestnaireVo.java
new file mode 100644
index 0000000..9b34873
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/EditComActQuestnaireVo.java
@@ -0,0 +1,16 @@
+package com.panzhihua.common.model.vos.community.questnaire;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: llming
+ * @Description:编辑问卷调查DO
+ */
+@Data
+public class EditComActQuestnaireVo {
+ @ApiModelProperty(value = "问卷调查Id")
+ private Long questId;
+ @ApiModelProperty(value = "状态 0 调研中 1已停止", example = "0")
+ private Integer state;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
index 9b360d7..dc7fd22 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/questnaire/QuestnaireVO.java
@@ -12,7 +12,7 @@
@Data
public class QuestnaireVO {
@ApiModelProperty(value = "问卷调查Id")
- private Long queId;
+ private Long questId;
@ApiModelProperty(value = "类型 0单选1多选2问答题", example = "0")
private Integer type;
@ApiModelProperty(value = "问卷标题")
@@ -21,6 +21,12 @@
private String queDescribe;
@ApiModelProperty(value = "问卷参与者类型 0 全部 1 志愿者 2 党员", example = "0")
private Integer parterType;
- @ApiModelProperty(value = "题目", example = "0")
+ @ApiModelProperty(value = "提供居民", example = "true")
+ private Boolean forMasses;
+ @ApiModelProperty(value = "提供党员", example = "true")
+ private Boolean forParty;
+ @ApiModelProperty(value = "提供志愿者", example = "true")
+ private Boolean forVolunteer;
+ @ApiModelProperty(value = "题目")
private List<QuestnaiteSubVO> questnaiteSubVOS;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index b1fc57c..5567c69 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -7,6 +7,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -1635,4 +1637,50 @@
@PostMapping("/common/data/population/getList")
R getPopulationLists(@RequestBody List<Long> Ids);
+ /**
+ * 新增社区问卷
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/addquestnaire")
+ R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+ /**
+ * 新增社区问卷
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/pagequestnaire")
+ R pageQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+
+ /**
+ * 编辑问卷——问卷、题目、选项
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnaire")
+ R editQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+
+
+ /**
+ * 修改问卷状态
+ *
+ * @param editComActQuestnaireVo
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnairedo")
+ R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo);
+
+ /**
+ * 删除问卷 ——隐藏
+ *
+ * @param questId 调查问卷Id
+ * @return
+ */
+ @PostMapping("/questnaire/deletequestnaire")
+ R editQuestnaireDO(@RequestParam("questId") Long questId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
index ddbed8a..db3abbf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
@@ -28,7 +28,7 @@
/**
* 状态 0 调研中 1已停止
*/
- private int state;
+ private Integer state;
/**
* 参与人数
*/
@@ -39,9 +39,17 @@
private Long communityId;
/**
- * 问卷参与者类型 0 全部 1 志愿者 2 党员
+ * 提供居民
*/
- private Integer parterType;
+ private Boolean forMasses;
+ /**
+ * 提供党员
+ */
+ private Boolean forParty;
+ /**
+ * 提供志愿者
+ */
+ private Boolean forVolunteer;
/**
* 是否隐藏显示 0 显示 1 隐藏
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
index 80dab75..18252ec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
/**
@@ -14,33 +15,41 @@
*
* @return
*/
- R AddQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId);
+ R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId);
/**
* 社区问卷列表
*/
- R PageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO);
+ R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO);
+
+ /**
+ * 编辑问卷——问卷、题目、选项
+ */
+ R editQuestnaire(QuestnaireVO questnaireVO);
/**
* 修改问卷状态
*/
- R editQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId);
+ R editQuestnaireDO(EditComActQuestnaireVo editComActQuestnaireVo, Long userId);
/**
* 删除问卷 ——隐藏
- * @param queId 问卷调查ID
+ *
+ * @param questId 问卷调查ID
* @return
*/
- R deleteQuestnaire(Long queId);
+ R deleteQuestnaire(Long questId, Long userId);
/**
* 问卷详情-调查结果统计
+ *
* @param questId 问卷ID
*/
R statQuestnaire(Long questId);
/**
* 问卷详细-问卷查看
+ *
* @param questId
* @return
*/
@@ -48,6 +57,7 @@
/**
* 问卷答题详情
+ *
* @param userId 用户ID
* @param questId 问卷ID
*/
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 5b387a6..98a23a4 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
@@ -13,7 +13,8 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.questnaire.*;
+import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.service_community.dao.ComActQuestnaireAnswerContentDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireDAO;
import com.panzhihua.service_community.dao.ComActQuestnaireSubDAO;
@@ -29,11 +30,12 @@
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 com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersSubAnswerVO;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
/**
* @Author: llming
@@ -55,7 +57,7 @@
ComActQuestnaireSubSelectionServiceImpl subSelectionService;
@Override
- public R AddQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
+ public R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
ComActQuestnaireDO comActQuestnaireDO = new ComActQuestnaireDO();
comActQuestnaireDO.setTitle(questnaireVO.getQueTitle());
comActQuestnaireDO.setQueDescribe(questnaireVO.getQueDescribe());
@@ -63,14 +65,16 @@
comActQuestnaireDO.setJoinCount(0);
comActQuestnaireDO.setCommunityId(communityId);
comActQuestnaireDO.setCreateBy(userId);
- comActQuestnaireDO.setParterType(questnaireVO.getParterType());
- int questnaireId = questnaireDAO.insert(comActQuestnaireDO);
+ comActQuestnaireDO.setForMasses(questnaireVO.getForMasses());
+ comActQuestnaireDO.setForParty(questnaireVO.getForParty());
+ comActQuestnaireDO.setForVolunteer(questnaireVO.getForVolunteer());
+ int questId = questnaireDAO.insert(comActQuestnaireDO);
questnaireVO.getQuestnaiteSubVOS().forEach(sub -> {
ComActQuestnaireSubDO comActQuestnaireSubDO = new ComActQuestnaireSubDO();
comActQuestnaireSubDO.setType(sub.getType());
comActQuestnaireSubDO.setContent(sub.getContent());
comActQuestnaireSubDO.setSort(sub.getSort());
- comActQuestnaireSubDO.setQueId((long) questnaireId);
+ comActQuestnaireSubDO.setQueId((long) questId);
comActQuestnaireSubDO.setCreateBy(userId);
int subId = questnaireSubDAO.insert(comActQuestnaireSubDO);
ArrayList<ComActQuestnaireSubSelectionDO> subSelectionList = Lists.newArrayList();
@@ -89,9 +93,12 @@
}
@Override
- public R PageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) {
+ public R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) {
Page userPage = new Page(pageQuestnaireDTO.getPageNum(), pageQuestnaireDTO.getPageSize());
LambdaQueryWrapper<ComActQuestnaireDO> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(ComActQuestnaireDO::getCommunityId, 0);
+ //过滤隐藏字段
+ lambdaQueryWrapper.eq(ComActQuestnaireDO::getIsHide, 0);
if (pageQuestnaireDTO.getTitle() != null) {
lambdaQueryWrapper.like(ComActQuestnaireDO::getTitle, pageQuestnaireDTO.getTitle());
}
@@ -110,10 +117,10 @@
}
@Override
- public R editQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId) {
+ public R editQuestnaire(QuestnaireVO questnaireVO) {
ComActQuestnaireDO questnaireDO = null;
- if (questnaireVO.getQueId() != null && questnaireVO.getQueId() != 0L) {
- questnaireDO = questnaireDAO.selectById(questnaireVO.getQueId());
+ if (questnaireVO.getQuestId() != null && questnaireVO.getQuestId() != 0L) {
+ questnaireDO = questnaireDAO.selectById(questnaireVO.getQuestId());
if (questnaireDO == null) {
return R.fail(500, "id有误！");
}
@@ -148,9 +155,26 @@
}
@Override
- public R deleteQuestnaire(Long queId) {
- LambdaQueryWrapper<ComActQuestnaireDO> subParam = new LambdaQueryWrapper<ComActQuestnaireDO>().eq(ComActQuestnaireDO::getId, queId);
+ public R editQuestnaireDO(EditComActQuestnaireVo editComActQuestnaireVo, Long userId) {
+ LambdaQueryWrapper<ComActQuestnaireDO> subParam = new LambdaQueryWrapper<ComActQuestnaireDO>().eq(ComActQuestnaireDO::getId, editComActQuestnaireVo.getQuestId());
+ ComActQuestnaireDO questDO = questnaireDAO.selectOne(subParam);
+ if (questDO == null) {
+ return R.fail(500, "Id有误！");
+ }
+ questDO.setState(editComActQuestnaireVo.getState());
+ questDO.setUpdateBy(userId);
+ questnaireDAO.updateById(questDO);
+ return R.ok();
+ }
+
+ @Override
+ public R deleteQuestnaire(Long questId, Long userId) {
+ LambdaQueryWrapper<ComActQuestnaireDO> subParam = new LambdaQueryWrapper<ComActQuestnaireDO>().eq(ComActQuestnaireDO::getId, questId);
ComActQuestnaireDO queDO = questnaireDAO.selectOne(subParam);
+ if (queDO == null) {
+ return R.fail();
+ }
+ queDO.setUpdateBy(userId);
queDO.setIsHide(1);
questnaireDAO.updateById(queDO);
return R.ok();
--
Gitblit v1.7.1