From 19bb7fa3894b8d95ff93901bf66a8cd3f6c63a87 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 16:26:15 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 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 bcca745..6c32bd2 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,6 +1,8 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +10,9 @@
import lombok.Data;
import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -21,6 +25,7 @@
public class ComActMicroWishVO {
@ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发起人id")
@@ -39,10 +44,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("集星数")
@@ -77,6 +82,10 @@
@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;
@@ -89,10 +98,10 @@
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;
@@ -104,7 +113,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;
@@ -130,7 +139,7 @@
private Integer isApplets;
@ApiModelProperty(value = "是否点赞 1 是 0 不是",example = "1")
- private Integer haveGiveThumbsUp;
+ private Integer haveGiveThumbsUp = 0;
@ApiModelProperty(value = "登录用户",hidden = true)
private Long userId;
@@ -141,5 +150,31 @@
@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;
+
+ @ApiModelProperty(value = "微心愿分配人id集合")
+ private List<Long> handleIds;
+
+ @ApiModelProperty(value = "微心愿分配人员集合")
+ private List<ComActMicroWishHandleVO> handleList;
+
+ @ApiModelProperty(value = "微心愿处理人id，多个以逗号隔开")
+ private String handleId;
}
--
Gitblit v1.7.1