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/dtos/community/PageComActDiscussDTO.java |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
index 80d890d..c8635f7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDiscussDTO.java
@@ -1,13 +1,12 @@
 package com.panzhihua.common.model.dtos.community;
 
+import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.panzhihua.common.validated.AddGroup;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -18,16 +17,16 @@
 @Data
 @ApiModel("分页查询一起议")
 public class PageComActDiscussDTO {
-    @ApiModelProperty(value = "分页-当前页数",example = "1")
-    private Long pageNum;
+    @ApiModelProperty(value = "分页-当前页数", example = "1")
+    private Long pageNum = 1L;
 
-    @ApiModelProperty(value = "分页-每页记录数",example = "10")
-    private Long pageSize;
+    @ApiModelProperty(value = "分页-每页记录数", example = "10")
+    private Long pageSize = 10L;
 
     @ApiModelProperty("主题")
     private String subject;
 
-    @ApiModelProperty(value = "社区id",hidden = true)
+    @ApiModelProperty(value = "社区id", hidden = true)
     private Long communityId;
 
     @ApiModelProperty("查询开始时间")
@@ -38,9 +37,32 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date end;
 
-    @ApiModelProperty(value = "登录用户",hidden = true)
+    @ApiModelProperty(value = "登录用户", hidden = true)
     private Long userId;
+
+    @ApiModelProperty(value = "登录用户-用于判断是否点赞和投票", hidden = true)
+    private Long loginUserId;
 
     @ApiModelProperty("小程序使用 1 表示查询我的议题")
     private Integer isMy;
+
+    @ApiModelProperty("状态(1.未开始 2.进行中 3.待公布 4.已公布 5.已发布)")
+    private Integer status;
+
+    @ApiModelProperty("关键词")
+    private String keyWord;
+
+    @ApiModelProperty(value = "类型: 1.议事 2.投票,小程序必须传入类型", allowableValues = "1,2")
+    private Integer type;
+
+    @ApiModelProperty(value = "展示状态,小程序获取不同状态的投票列表 1.进行中 2.已结束", allowableValues = "1,2")
+    private Integer displayStatus;
+
+    @ApiModelProperty("议事内容类型(1.社区议事 2.院落议事 3.党群议事 4.居民议事 5.其他)")
+    private Integer contentType;
+
+    @ApiModelProperty(value = "是否党员", hidden = true)
+    private Integer isPbMember;
+    @ApiModelProperty(value = "是否志愿者", hidden = true)
+    private Integer isVolunteer;
 }

--
Gitblit v1.7.1