From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
index 8005ad7..517b47e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -24,7 +25,7 @@
@ApiModelProperty("主题")
private String discussSubject;
- @ApiModelProperty("类型 1 图文 2 投票")
+ @ApiModelProperty("类型 1 议事 2 投票")
private Integer type;
@ApiModelProperty("图片地址 多个用逗号隔开")
@@ -58,6 +59,9 @@
@ApiModelProperty("点赞数量")
private Integer signNum;
+ @ApiModelProperty("浏览量")
+ private Integer viewsNum;
+
@ApiModelProperty("发布人名字")
private String userName;
@@ -76,4 +80,60 @@
@ApiModelProperty("用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台")
private Integer userType;
+ @ApiModelProperty("状态（1.未开始 2.进行中 3.待公布 4.已公布 5.已发布）")
+ private Integer status;
+
+ @ApiModelProperty("公布结果")
+ private String publishResult;
+
+ @ApiModelProperty("公布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date publishAt;
+
+ @ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date releaseAt;
+
+ @ApiModelProperty("投票开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("投票结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty("参与讨论人数")
+ private Integer joinNum;
+
+ @ApiModelProperty("单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty("单张图片高度")
+ private BigDecimal imgHeight;
+
+ @ApiModelProperty("是否可重复投票（1.是 2.否）")
+ private Integer isRepeat;
+
+ @ApiModelProperty("每人票数")
+ private Integer count;
+
+ @ApiModelProperty("议事投票评论列表")
+ private List<ComActDiscussCommentVO> discussCommentList;
+
+ @ApiModelProperty("剩余可投票数")
+ private Integer remainingVotes;
+
+ @ApiModelProperty("已投票记录列表")
+ private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;
+
+ @ApiModelProperty("已参与投票人数")
+ private Integer votedPersonNum;
+
+ /**
+ * 类型 1 议事 2 投票
+ */
+ public interface type{
+ int ys = 1;
+ int tp = 2;
+ }
}
--
Gitblit v1.7.1