From a934e3e3ae90b2bf7b564426387be5b9343bad07 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 02 三月 2022 11:07:08 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComActDiscussDTO.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 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 f17dde6..0f7e50b 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
@@ -1,34 +1,39 @@
package com.panzhihua.common.model.dtos.community;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
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;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
- * @description: 一起议新增编辑
+ * @description: 议事投票新增编辑
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2021-01-22 15:34
**/
@Data
-@ApiModel("一起议新增编辑")
+@ApiModel("议事投票新增编辑")
public class ComActDiscussDTO {
@ApiModelProperty("主键")
+ @NotNull(message = "一起议id不能为空", groups = {PutGroup.class})
private Long id;
@ApiModelProperty("主题")
@NotBlank(groups = {AddGroup.class}, message = "主题不能为空")
private String discussSubject;
- @ApiModelProperty("类型 1 图文 2 投票")
+ @ApiModelProperty("类型 1 议事 2 投票")
@Min(value = 1, groups = {AddGroup.class}, message = "类型不能为空")
private Integer type;
@@ -56,4 +61,39 @@
@ApiModelProperty("选项集合")
private List<ComActDiscussOptionDTO> discussOptions;
+ @ApiModelProperty(value = "单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty(value = "单张图片高度")
+ private BigDecimal imgHeight;
+
+ @ApiModelProperty(value = "投票开始时间(格式：yyyy-MM-dd HH:mm:ss)")
+ private String startTime;
+
+ @ApiModelProperty(value = "投票结束时间(格式：yyyy-MM-dd HH:mm:ss)")
+ private String endTime;
+
+ @ApiModelProperty(value = "是否可重复投票（1.是 2.否）")
+ private Integer isRepeat;
+
+ @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;
+
+ /**
+ * 类型 1 议事 2 投票
+ */
+ public interface type{
+ int ys = 1;
+ int tp = 2;
+ }
}
--
Gitblit v1.7.1