From 86df207c37502cce1b2043e1c7c0486459eef1d6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 三月 2025 19:58:45 +0800
Subject: [PATCH] 党员、诉求评论基础代码

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 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 1b17241..a417396 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
@@ -6,6 +6,8 @@
 
 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;
@@ -20,6 +22,7 @@
 @ApiModel("一起议议详情")
 public class ComActDiscussVO {
     @ApiModelProperty("主键")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty("主题")
@@ -35,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")
@@ -109,7 +114,7 @@
     private BigDecimal imgWidth;
 
     @ApiModelProperty("单张图片高度")
-    private BigDecimal heightWidth;
+    private BigDecimal imgHeight;
 
     @ApiModelProperty("是否可重复投票(1.是 2.否)")
     private Integer isRepeat;
@@ -117,12 +122,32 @@
     @ApiModelProperty("每人票数")
     private Integer count;
 
+    @ApiModelProperty("议事投票评论列表")
+    private List<ComActDiscussCommentVO> discussCommentList;
+
     @ApiModelProperty("剩余可投票数")
     private Integer remainingVotes;
 
     @ApiModelProperty("已投票记录列表")
     private List<ComActDiscussOptionUserVO> comActDiscussOptionUserVOList;
 
+    @ApiModelProperty("议事内容类型(1.社区议事 2.院落议事 3.党群议事 4.居民议事 5.其他)")
+    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