From da9d3cd6be3dbd04d638788210437e2af46ca90e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 15 十一月 2023 17:15:34 +0800
Subject: [PATCH] 社区组织共建详情修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java | 95 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 86 insertions(+), 9 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 7f3a19b..5704cc8 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,13 +1,16 @@
package com.panzhihua.common.model.vos.community;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
-import lombok.Data;
-
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -19,12 +22,13 @@
@ApiModel("一起议议详情")
public class ComActDiscussVO {
@ApiModelProperty("主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("主题")
private String discussSubject;
- @ApiModelProperty("类型 1 图文 2 投票")
+ @ApiModelProperty("类型 1 议事 2 投票")
private Integer type;
@ApiModelProperty("图片地址 多个用逗号隔开")
@@ -34,9 +38,11 @@
private String address;
@ApiModelProperty("发布人主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("社区主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
@ApiModelProperty("create_at")
@@ -58,6 +64,9 @@
@ApiModelProperty("点赞数量")
private Integer signNum;
+ @ApiModelProperty("浏览量")
+ private Integer viewsNum;
+
@ApiModelProperty("发布人名字")
private String userName;
@@ -68,9 +77,77 @@
private String imageUrl;
@ApiModelProperty("是否已经点赞 1 是 0 否")
- private Integer haveSign;
+ private Integer haveSign = 0;
@ApiModelProperty("是否已经投票 1 是 0 否")
- private Integer haveVote;
+ private Integer haveVote = 0;
+ @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("议事内容类型（1.社区议事 2.院落议事 3.党群议事）")
+ private Integer contentType;
+
+ @ApiModelProperty("已参与投票人数")
+ private Integer votedPersonNum;
+
+ @ApiModelProperty("投票范围（1.全部居民 2.志愿者 3.党员）")
+ private Integer voteScope;
+
+ @ApiModelProperty("是否需要签名")
+ private Boolean needSign;
+
+ /**
+ * 类型 1 议事 2 投票
+ */
+ public interface type{
+ int ys = 1;
+ int tp = 2;
+ }
}
--
Gitblit v1.7.1