From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
index ae68b1c..ee04562 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java
@@ -6,9 +6,12 @@
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.validated.AddGroup;
 
+import com.panzhihua.common.validated.PutGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,6 +26,7 @@
 @ApiModel("议事投票新增编辑")
 public class ComActDiscussDTO {
     @ApiModelProperty("主键")
+    @NotNull(message = "一起议id不能为空", groups = {PutGroup.class})
     private Long id;
 
     @ApiModelProperty("主题")
@@ -75,4 +79,30 @@
     @ApiModelProperty(value = "每人可投票数")
     private Integer count;
 
+    @ApiModelProperty(value = "是否是小程序用户", hidden = true)
+    private Boolean isApplets;
+
+    @ApiModelProperty(value = "当前登录用户信息", hidden = true)
+    private LoginUserInfoVO loginUserInfo;
+
+    @ApiModelProperty("投票结果")
+    @NotBlank(message = "投票结果不能为空", groups = {PutGroup.class})
+    private String publishResult;
+
+    @ApiModelProperty("议事内容类型(1.社区议事 2.院落议事 3.党群议事)")
+    private Integer contentType;
+
+    @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