From a2484b2ba1d7cc230f73bd013477d329e4faed6b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 08 九月 2021 14:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
index 2448ad5..aac3e8f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java
@@ -1,12 +1,16 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -30,17 +34,21 @@
@ApiModelProperty("发起人名字")
private String sponsorName;
+ @ApiModelProperty("发起人昵称")
+ private String userNickName;
+
@ApiModelProperty("发起人头像")
private String imageUrl;
@ApiModelProperty("微心愿名称")
+// @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空")
private String wishName;
- @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成")
+ @ApiModelProperty("状态 1待审核 2待分配 3进行中 4已驳回 5待确认6 已完成 7集心中")
private Integer status;
@ApiModelProperty("集星数")
- private Integer startNum;
+ private Integer starNum;
@ApiModelProperty("形式 1分配人员 2发起活动")
private Integer form;
@@ -71,20 +79,26 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date distributionAt;
+ @ApiModelProperty("完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date finishAt;
+
@ApiModelProperty("评分")
private Integer score;
@ApiModelProperty("详情")
+ @NotBlank(groups = {AddGroup.class},message = "详情不能为空")
private String detail;
@ApiModelProperty("图片路径列表，逗号分隔")
+ //@NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
private String photoPathList;
@ApiModelProperty("当前页数")
- private Long pageNum;
+ private Long pageNum = 1L;
@ApiModelProperty("每页记录数")
- private Long pageSize;
+ private Long pageSize = 10L;
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
@@ -93,9 +107,11 @@
private String evaluate;
@ApiModelProperty("用户评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date evaluateAt;
- @ApiModelProperty("反馈时间")
+ @ApiModelProperty("集心完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date feedbackAt;
@ApiModelProperty("完成情况图片列表，逗号分隔")
@@ -113,13 +129,40 @@
@ApiModelProperty("反馈图片集合，逗号分隔")
private String feedbackPhotoPathList;
- @ApiModelProperty("操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈")
+ @ApiModelProperty(value = "操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈",example = "1")
private Integer type;
@ApiModelProperty(value = "小程序请求 1 是 0 不是",hidden = true)
private Integer isApplets;
- @ApiModelProperty(value = "是否点赞 1 是 0 不是")
- private Integer haveGiveThumbsUp;
+ @ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1")
+ private Integer haveGiveThumbsUp = 0;
+
+ @ApiModelProperty(value = "登录用户",hidden = true)
+ private Long userId;
+
+ @ApiModelProperty(value = "社区后台登录用户",hidden = true)
+ private Long backUserId;
+
+ @ApiModelProperty(value = "是否是分页查询微心愿接口调用",hidden = true)
+ private Integer isPageMyWish;
+
+ @ApiModelProperty(value = "预约社区集心数")
+ private Integer aimNum;
+
+ @ApiModelProperty(value = "反馈列表")
+ private List<ComActMicroWishFeedbackVO> feedbackVOList;
+
+ @ApiModelProperty(value = "操作记录 只有审核和驳回得纪录 其他从当前数据提取")
+ private List<ComActMicroWishOperationRecordVO> operationRecordVOList;
+
+ @ApiModelProperty(value = "下一个id数组")
+ private List<Long> idList;
+
+ @ApiModelProperty(value = "单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty(value = "单张图片高度")
+ private BigDecimal imgHeight;
}
--
Gitblit v1.7.1