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/ComActEasyPhotoVO.java | 138 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 129 insertions(+), 9 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 1d4816d..1c75821 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,12 +1,18 @@ package com.panzhihua.common.model.vos.community; +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.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 java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -25,22 +31,26 @@ private Long sponsorId; @ApiModelProperty("发起人名字") - private Long sponsorName; + private String sponsorName; + + @ApiModelProperty("发布人昵称") + private String userNickName; @ApiModelProperty("发生地址") + @NotBlank(groups = {AddGroup.class}, message = "发生地址不能为空") private String happenAddr; @ApiModelProperty("发起人头像") private String imageUrl; - @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4已完成") + @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4已完成") private Integer status; @ApiModelProperty("处理人id") private Long handlerId; @ApiModelProperty("处理人名字") - private Long handlerName; + private String handlerName; @ApiModelProperty("查询-创建开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -51,9 +61,11 @@ private Date createEnd; @ApiModelProperty("详情") + @NotBlank(groups = {AddGroup.class}, message = "详情不能为空") private String detail; @ApiModelProperty("图片路径列表,逗号分隔") + @NotBlank(groups = {AddGroup.class}, message = "图片路径列表不能为空") private String photoPathList; @ApiModelProperty("处理结果") @@ -73,7 +85,7 @@ private Date examineAt; @ApiModelProperty("创建时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("社区id") @@ -82,9 +94,117 @@ @ApiModelProperty("点赞数量") private Integer giveThumbsUpNum; - @ApiModelProperty("是否匿名发布") + @ApiModelProperty("评论数量") + private Integer commentNum; + + @ApiModelProperty("是否匿名发布 0 否 1 是") + @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") + private Integer isNeedFeedBack; + + @ApiModelProperty("操作类型 1处理随手拍 2驳回 3反馈 4.完成随手拍") + private Integer type; + + @ApiModelProperty(value = "登录用户id", hidden = true) + private Long userId; + + @ApiModelProperty(value = "登录用户id", hidden = true) + private Long logInUserId; + + @ApiModelProperty("反馈时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date feedbackAt; + + @ApiModelProperty("发起人手机号") + private String phone; + + @ApiModelProperty("拒绝原因") + private String rejectReason; + + @ApiModelProperty(value = "后台登录人员id", hidden = true) + private Long backUserId; + + @ApiModelProperty(value = "地址备注") + private String addrRemark; + + @ApiModelProperty(value = "是否上报社区处理(0.否 1.是)") + private Integer isReport; + + @ApiModelProperty(value = "是否公示(0.否 1.是)") + private Integer isPublicity; + + @ApiModelProperty(value = "处理状态(1.待处理 2.已处理)") + private Integer handleStatus; + + @ApiModelProperty(value = "发生地址经纬度信息,逗号分割(长的在前面,短的在后面)") + private String lngLat; + + @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; + + @ApiModelProperty(value = "类型(1.心情类 2.治理类)") + private Integer easyType; + + @ApiModelProperty(value = "随手拍活动") + private ComActEasyPhotoActivityVO easyPhotoActivityVO; + + @ApiModelProperty(value = "关键词") + private String keyWord; + + @ApiModelProperty(value = "反馈信息列表") + private List<ComActEasyPhotoFeedbackVO> photoFeedbackList; + + @ApiModelProperty(value = "完成人名称") + private String completeName; + + @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; + } -- Gitblit v1.7.1