From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 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 2add8d6..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,15 +1,16 @@
package com.panzhihua.common.model.vos.community;
-import java.util.Date;
-
-import javax.validation.constraints.NotBlank;
-
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
@@ -40,10 +41,10 @@
private String imageUrl;
@ApiModelProperty("微心愿名称")
- @NotBlank(groups = {AddGroup.class}, message = "微心愿名称不能为空")
+// @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("集星数")
@@ -78,24 +79,28 @@
@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 = "详情不能为空")
+ @NotBlank(groups = {AddGroup.class},message = "详情不能为空")
private String detail;
@ApiModelProperty("图片路径列表，逗号分隔")
- // @NotBlank(groups = {AddGroup.class},message = "图片路径列表不能为空")
+ //@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)
+ @ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
@ApiModelProperty("用户评价")
@@ -105,7 +110,7 @@
@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;
@@ -124,22 +129,40 @@
@ApiModelProperty("反馈图片集合，逗号分隔")
private String feedbackPhotoPathList;
- @ApiModelProperty(value = "操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈", example = "1")
+ @ApiModelProperty(value = "操作类型 1 审核通过 2驳回 3分配人员 4发起活动 5反馈",example = "1")
private Integer type;
- @ApiModelProperty(value = "小程序请求 1 是 0 不是", hidden = true)
+ @ApiModelProperty(value = "小程序请求 1 是 0 不是",hidden = true)
private Integer isApplets;
- @ApiModelProperty(value = "是否点赞 1 是 0 不是", example = "1")
+ @ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1")
private Integer haveGiveThumbsUp = 0;
- @ApiModelProperty(value = "登录用户", hidden = true)
+ @ApiModelProperty(value = "登录用户",hidden = true)
private Long userId;
- @ApiModelProperty(value = "社区后台登录用户", hidden = true)
+ @ApiModelProperty(value = "社区后台登录用户",hidden = true)
private Long backUserId;
- @ApiModelProperty(value = "是否是分页查询微心愿接口调用", hidden = true)
+ @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