From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期二, 14 十一月 2023 17:49:20 +0800 Subject: [PATCH] 修改打卡 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 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 76ee508..d4cc136 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") @@ -168,8 +172,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; @@ -193,6 +203,9 @@ @ApiModelProperty(value = "随手拍分类名称") private String classifyName; + @ApiModelProperty(value = "1 随手拍 2网格治理") + private String addType; + /** * 是否上报城管 0未上报 1已上报 2已退回 */ @@ -211,7 +224,25 @@ @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