From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java | 87 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
index 80f9cc4..d27df45 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -1,11 +1,14 @@
package com.panzhihua.common.model.vos.neighbor;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
/**
* @auther lyq
@@ -17,6 +20,7 @@
public class ComActNeighborCircleDetailAppVO {
@ApiModelProperty("邻里圈id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("邻里圈发布人名字")
@@ -47,9 +51,11 @@
private Integer isBoutique;
@ApiModelProperty("发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("最后回复时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date replyAt;
@ApiModelProperty("邻里圈评论列表")
@@ -59,6 +65,79 @@
* 是否已经点赞 1 是 2 否
*/
@ApiModelProperty("是否已经点赞 1 是 2 否")
- private Integer haveSign;
+ private Integer haveSign = 2;
+
+ /**
+ * 发布类型（1.小程序发布 2.后台发布）
+ */
+ @ApiModelProperty("发布类型（1.小程序发布 2.后台发布）")
+ private Integer type;
+
+ /**
+ * 社区id
+ */
+ @ApiModelProperty("社区id")
+ private Long communityId;
+
+ @ApiModelProperty("邻里圈话题名字")
+ private String topicName;
+
+ @ApiModelProperty("驳回原因")
+ private String refuseReason;
+
+ @ApiModelProperty("处理状态 0 否 1是")
+ private Integer solveStatus;
+ @ApiModelProperty("接单状态 0 否 1是")
+ private Integer orderStatus;
+ @ApiModelProperty("接单人id")
+ private Long solveId;
+ @ApiModelProperty("反馈内容")
+ private String solveContent;
+ @ApiModelProperty("反馈图片")
+ private String solveUrl;
+ @ApiModelProperty("接单人名称")
+ private String solveName;
+ @ApiModelProperty("接单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date orderTime;
+ @ApiModelProperty("处理时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date solveTime;
+
+ private Long topicId;
+
+ private Long releaseId;
+
+ private Integer status;
+ @ApiModelProperty("接单类型 1单位 2个人")
+ private Integer orderType;
+ @ApiModelProperty("预计服务时长")
+ private String targetServiceTime;
+ @ApiModelProperty("实际服务时长")
+ private String realServiceTime;
+ @ApiModelProperty("评价内容")
+ private String comment;
+ @ApiModelProperty("评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date commentTime;
+ @ApiModelProperty("说明")
+ private String instruction;
+ @ApiModelProperty("求助党员类型 1全部 2指定")
+ private Integer helpMemberType;
+ @ApiModelProperty("求助指定党员数组")
+ private String helpMemberContent;
+ @ApiModelProperty("求助党组织类型 1全部 2指定")
+ private Integer helpOrgType;
+ @ApiModelProperty("求助指定党组织数组")
+ private String helpOrgContent;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+ private Long solveUnitId;
+
+ private String activityName;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long activityId;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date activityDate;
}
--
Gitblit v1.7.1