From f1afc9dd47bc8e9d4d2c86a5bbd099ee0d7824f2 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 07 六月 2021 20:14:00 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageQuestnaireDTO.java | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 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 529854d..52fc494 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
@@ -1,23 +1,41 @@
package com.panzhihua.common.model.dtos.community;
-import com.panzhihua.common.model.vos.community.questnaire.QuestnaiteSubVO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 = "用户Id")
+ private Long userId;
+ @ApiModelProperty(value = "状态 0 调研中 1已停止")
+ private Integer state;
+ @ApiModelProperty(value = "发布开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+ @ApiModelProperty(value = "发布结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
+ private Long pageNum;
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
+ private Long pageSize;
+ @ApiModelProperty("提供居民")
+ private Boolean forMasses;
+ @ApiModelProperty("提供党员")
+ private Boolean forParty=false;
+ @ApiModelProperty("提供志愿者")
+ private Boolean forVolunteer=false;
+ @ApiModelProperty("社区ID")
+ private Long communityId;
}
--
Gitblit v1.7.1