springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java
@@ -1,23 +1,30 @@ package com.panzhihua.common.model.dtos.community; import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; import java.util.Date; /** * @Author: llming * @Description: */ @Data @ApiModel("问卷列表参数") public class PageQuestnaireDTO { @ApiModelProperty(value = "类型 0单选1多选2问答题", example = "0") private int type; @ApiModelProperty(value = "问卷标题") private String queTitle; @ApiModelProperty(value = "问卷描述") private String queDescribe; @ApiModelProperty(value = "题目", example = "0") private List<QuestnaiteSubVO> questnaiteSubVOS; @ApiModelProperty(value = "标题") 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 = "发布结束时间") private Date endTime; @ApiModelProperty(value = "分页-当前页数", example = "1") private Long pageNum; @ApiModelProperty(value = "分页-每页记录数", example = "10") private Long pageSize; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BaseDO.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -14,9 +15,11 @@ @Data public class BaseDO { private Long creatBy; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField(fill = FieldFill.INSERT) private Date createAt; private Long updateBy; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField(fill = FieldFill.INSERT) private Date updateAt; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireDO.java
@@ -25,7 +25,7 @@ /** * 状态 0 调研中 1已停止 */ private int state; private Integer state; /** * 参与人数 */ @@ -38,6 +38,6 @@ /** * 问卷参与者类型 0 全部 1 志愿者 2 党员 */ private Long parterType; private Integer parterType; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubDO.java
@@ -17,7 +17,7 @@ /** * 类型 0单选1多选2问答题 */ private int type; private Integer type; /** * 题目内容 */ @@ -25,7 +25,7 @@ /** * 序号 */ private int sort; private Integer sort; /** * 调查问卷Id */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActQuestnaireSubSelectionDO.java
@@ -21,7 +21,7 @@ /** * 选项排序 */ private int sort; private Integer sort; /** * 选项内容 */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
@@ -1,5 +1,6 @@ package com.panzhihua.service_community.service; import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.questnaire.AddQuestnaireVO; @@ -16,7 +17,7 @@ /** * 社区问卷列表 */ R ListQuestnaire(); R ListQuestnaire(PageQuestnaireDTO pageQuestnaireDTO); /** * 修改问卷状态 */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -2,22 +2,27 @@ import java.util.Date; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; import com.panzhihua.common.enums.QuestnaireState; import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.questnaire.AddQuestnaireVO; import com.panzhihua.service_community.dao.ComActQuestnaireAnswerContentDAO; import com.panzhihua.service_community.dao.ComActQuestnaireDAO; import com.panzhihua.service_community.dao.ComActQuestnaireSubDAO; import com.panzhihua.service_community.dao.ComActQuestnaireSubSelectionDAO; import com.panzhihua.service_community.model.dos.ComActQuestnaireDO; import com.panzhihua.service_community.model.dos.ComActQuestnaireSubDO; import com.panzhihua.service_community.model.dos.ComActQuestnaireSubSelectionDO; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComActQuestnaireService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; /** * @Author: llming @@ -71,9 +76,21 @@ } @Override public R ListQuestnaire() { //questnaireDAO. return null; public R ListQuestnaire(PageQuestnaireDTO pageQuestnaireDTO) { Page userPage = new Page(pageQuestnaireDTO.getPageNum(), pageQuestnaireDTO.getPageSize()); LambdaQueryWrapper<ComActQuestnaireDO> lambdaQueryWrapper = Wrappers.lambdaQuery(); if (pageQuestnaireDTO.getTitle() != null) { lambdaQueryWrapper.like(ComActQuestnaireDO::getTitle, pageQuestnaireDTO.getTitle()); } if (pageQuestnaireDTO.getTitle() != null) { lambdaQueryWrapper.eq(ComActQuestnaireDO::getState, pageQuestnaireDTO.getState()); } if (pageQuestnaireDTO.getEndTime() != null && pageQuestnaireDTO.getStartTime() != null) { lambdaQueryWrapper.ge(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getStartTime()); lambdaQueryWrapper.lt(ComActQuestnaireDO::getCreateAt, pageQuestnaireDTO.getEndTime()); } IPage<ComActQuestnaireDO> doPager = questnaireDAO.selectPage(userPage, lambdaQueryWrapper.orderByDesc(ComActQuestnaireDO::getCreateAt)); return R.ok(doPager); } @Override springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -64,7 +64,7 @@ BeanUtils.copyProperties(comStreetDO1, comStreetVO); return R.ok(comStreetVO); } return R.fail(500,""); return R.fail(500, ""); }
