From 0283bb25ebbbb506ec54f90d9a0534c7b25b5655 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 11 七月 2024 17:04:06 +0800
Subject: [PATCH] 花城 【小程序】统计排行完善逻辑
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 5 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 a3a32e1..544127b 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
@@ -6,8 +6,11 @@
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;
@@ -25,6 +28,7 @@
public class ComActEasyPhotoVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("发起人id")
@@ -43,7 +47,7 @@
@ApiModelProperty("发起人头像")
private String imageUrl;
- @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4已完成")
+ @ApiModelProperty("状态 1待审核 2进行中 3已驳回 4待评价 5.已完成")
private Integer status;
@ApiModelProperty("处理人id")
@@ -89,7 +93,12 @@
private Date createAt;
@ApiModelProperty("社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
+
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
@ApiModelProperty("点赞数量")
private Integer giveThumbsUpNum;
@@ -168,8 +177,14 @@
@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;
@@ -184,14 +199,14 @@
@ApiModelProperty(value = "城管安排状态 0未安排 1已安排 2已处理")
private Integer urbanStatus;
- @ApiModelProperty(value = "社区名字")
- private String communityName;
-
@ApiModelProperty(value = "随手拍分类id")
private Long classifyId;
@ApiModelProperty(value = "随手拍分类名称")
private String classifyName;
+
+ @ApiModelProperty(value = "1 随手拍 2网格治理")
+ private String addType;
/**
* 是否上报城管 0未上报 1已上报 2已退回
@@ -201,4 +216,35 @@
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