From 73f86cb94faa49f1157d6c9f00737a28f63507f4 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 09:52:48 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 127 +++++++++++++++++++++++++++++++++++-------
1 files changed, 106 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
index 05e654f..1295412 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java
@@ -1,17 +1,21 @@
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.Min;
-import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoEvaluateVo;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -24,6 +28,7 @@
public class ComActEasyPhotoVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发起人id")
@@ -36,13 +41,13 @@
private String userNickName;
@ApiModelProperty("发生地址")
- @NotBlank(groups = {AddGroup.class},message = "发生地址不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "发生地址不能为空")
private String happenAddr;
@ApiModelProperty("发起人头像")
private String imageUrl;
- @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4已完成")
+ @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4待评价 5.已完成")
private Integer status;
@ApiModelProperty("处理人id")
@@ -60,11 +65,11 @@
private Date createEnd;
@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("处理结果")
@@ -97,22 +102,22 @@
private Integer commentNum;
@ApiModelProperty("是否匿名发布 0 否 1 是")
- @Min(value = 0,groups = {AddGroup.class},message = "是否匿名发布不能为空")
+ @Min(value = 0, groups = {AddGroup.class}, message = "是否匿名发布不能为空")
private Integer isHide;
@ApiModelProperty("是否点赞 0 否 1 是")
- private Integer haveGiveThumbsUp;
+ private Integer haveGiveThumbsUp = 0;
- @ApiModelProperty(value = "是否需要反馈 1 是 0 不是",example = "0")
+ @ApiModelProperty(value = "是否需要反馈 1 是 0 不是", example = "0")
private Integer isNeedFeedBack;
- @ApiModelProperty("操作类型 1审核通过 2驳回 3反馈")
+ @ApiModelProperty("操作类型 1处理随手拍 2驳回 3反馈 4.完成随手拍")
private Integer type;
- @ApiModelProperty(value = "登录用户id",hidden = true)
+ @ApiModelProperty(value = "登录用户id", hidden = true)
private Long userId;
- @ApiModelProperty(value = "登录用户id",hidden = true)
+ @ApiModelProperty(value = "登录用户id", hidden = true)
private Long logInUserId;
@ApiModelProperty("反馈时间")
@@ -125,7 +130,7 @@
@ApiModelProperty("拒绝原因")
private String rejectReason;
- @ApiModelProperty(value = "后台登录人员id",hidden = true)
+ @ApiModelProperty(value = "后台登录人员id", hidden = true)
private Long backUserId;
@ApiModelProperty(value = "地址备注")
@@ -143,11 +148,14 @@
@ApiModelProperty(value = "发生地址经纬度信息，逗号分割(长的在前面，短的在后面)")
private String lngLat;
- @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般）")
+ @ApiModelProperty(value = "随手拍标签（1.优质 2.精良 3.普通 4.一般 5.无）")
private Integer activityType;
@ApiModelProperty(value = "参加活动奖励金额")
private BigDecimal activityAmount;
+
+ @ApiModelProperty(value = "活动奖励金额")
+ private BigDecimal activityMoney;
@ApiModelProperty(value = "随手拍活动id")
private Long activityId;
@@ -157,4 +165,81 @@
@ApiModelProperty(value = "随手拍活动")
private ComActEasyPhotoActivityVO easyPhotoActivityVO;
+
+ @ApiModelProperty(value = "关键词")
+ private String keyWord;
+
+ @ApiModelProperty(value = "反馈信息列表")
+ private List<ComActEasyPhotoFeedbackVO> photoFeedbackList;
+
+ @ApiModelProperty(value = "人大代表反馈信息列表")
+ private List<ComActEasyPhotoFeedbackVO> photoFeedbackListForDpc;
+
+ @ApiModelProperty(value = "完成人名称")
+ private String completeName;
+
+ @ApiModelProperty(value = "是否上报到人大代表（ 0未上报 1已上报）")
+ private Integer isReportDpc;
+
+ @ApiModelProperty(value = "是否上报城管 0未上报 1已上报 2已退回")
+ private Integer isReportUrban;
+
+ @ApiModelProperty(value = "城管移交说明（备注）")
+ private String transferReason;
+
+ @ApiModelProperty("移交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date transferTime;
+
+ @ApiModelProperty(value = "城管安排状态 0未安排 1已安排 2已处理")
+ private Integer urbanStatus;
+
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+
+ @ApiModelProperty(value = "随手拍分类id")
+ private Long classifyId;
+
+ @ApiModelProperty(value = "随手拍分类名称")
+ private String classifyName;
+
+ /**
+ * 是否上报城管 0未上报 1已上报 2已退回
+ */
+ public interface isReportUrban {
+ int no = 0;
+ int yes = 1;
+ int ret = 2;
+ }
+ @ApiModelProperty(value = "单张图片宽度")
+ private BigDecimal imgWidth;
+
+ @ApiModelProperty(value = "单张图片高度")
+ private BigDecimal imgHeight;
+
+ @ApiModelProperty(value = "评价时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date evaluateDate;
+
+ @ApiModelProperty(value = "评价分数")
+ private Integer score;
+
+ @ApiModelProperty(value = "评价内容")
+ private String content;
+
+ @ApiModelProperty(value = "评价记录")
+ private List<ComActEasyPhotoEvaluateVo> evaluateList;
+
+ @ApiModelProperty(value = "微心愿分配人员集合")
+ private List<ComActMicroWishHandleVO> handleList;
+
+ @ApiModelProperty(value = "人大代表是否反馈（1.未反馈 2.已反馈）")
+ private Integer isFeedBackForDpc;
+
+ @ApiModelProperty(value = "是否人大代表成员 1.是 2.否", hidden = true)
+ private Integer isDpcMember;
+
+ @ApiModelProperty(value = "处理记录")
+ private List<ComActEasyPhotoHandlerVo> handleRecordList;
+
}
--
Gitblit v1.7.1