From e7f03acfa5ee4ad4fd6d1ee9e9ae9a5655488f6d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:04:46 +0800
Subject: [PATCH] 1109修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java |   28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 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 44f8dc1..d58aafe 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
@@ -8,6 +8,7 @@
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -40,7 +41,7 @@
     private String imageUrl;
 
     @ApiModelProperty("微心愿名称")
-    @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空")
+//    @NotBlank(groups = {AddGroup.class},message = "微心愿名称不能为空")
     private String wishName;
 
     @ApiModelProperty("状态 1待审核  2待分配 3进行中  4已驳回 5待确认6 已完成 7集心中")
@@ -78,6 +79,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;
 
@@ -90,10 +95,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;
@@ -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;
 
@@ -150,5 +155,20 @@
 
     @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 = "微心愿处理人id,多个以逗号隔开")
+    private String handleId;
 }
 

--
Gitblit v1.7.1