From 0135fa289418c5fd231fa4e7c60ee7b8f06f17a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 06 五月 2025 19:29:11 +0800
Subject: [PATCH] Merge branch 'dev-2.0.1' of http://120.76.84.145:10101/gitblit/r/java/zhihuishenqu into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
index 76b4c5b..a4c0c1d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/vo/ComplaintVO.java
@@ -1,12 +1,13 @@
package com.panzhihua.sangeshenbian.model.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
+import com.panzhihua.sangeshenbian.model.entity.ComplaintComment;
import com.panzhihua.sangeshenbian.model.entity.ComplaintFlow;
import com.panzhihua.sangeshenbian.model.entity.ComplaintProgress;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
@@ -15,12 +16,26 @@
* @author mitao
* @date 2025/2/23
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel("工单视图对象")
public class ComplaintVO extends Complaint {
@ApiModelProperty(value = "上报人")
private String reporter;
+
+ @ApiModelProperty(value = "上报人id")
+ private Long reporterId;
+
+ private Long superiorId2;
+
+ private Long auditCreateBy;
+
+ @ApiModelProperty("上报人层级 1=市级账号，2=区县账号，3=街道账号，4=社区账号 5=党员账号")
+ private Integer reporterLevel;
+
+ @ApiModelProperty(value = "上报人联系方式")
+ private String reporterPhone;
@ApiModelProperty(value = "所属部门")
private String departmentName;
@@ -31,10 +46,10 @@
@ApiModelProperty(value = "上报说明")
private String comment;
- @ApiModelProperty(value = "录入人")
+ @ApiModelProperty(value = "录入人-弃用")
private String nickname;
- @ApiModelProperty(value = "联系方式")
+ @ApiModelProperty(value = "联系方式-弃用")
private String phone;
@ApiModelProperty(value = "审核人")
@@ -47,11 +62,32 @@
private String rejectReason;
@ApiModelProperty(value = "审核时间")
- private Date auditTime;
+ private String auditTime;
@ApiModelProperty(value = "诉求流转记录")
- List<ComplaintFlow> complaintFlows;
+ private List<ComplaintFlow> complaintFlows;
@ApiModelProperty(value = "办理进度")
- List<ComplaintProgress> complaintProgresses;
+ private List<ComplaintProgress> complaintProgresses;
+
+ @ApiModelProperty(value = "审核按钮状态（0=显示，1=隐藏）")
+ private Integer auditButtonStatus;
+
+ @ApiModelProperty(value = "撤回按钮状态（0=显示，1=隐藏）")
+ private Integer withdrawButtonStatus;
+
+ @ApiModelProperty(value = "评价打分 0：不满意； 1：一般； 2：满意； 3：非常满意；")
+ private Integer rate;
+
+ @ApiModelProperty(value = "办结评价")
+ private ComplaintComment complaintComment;
+
+ @ApiModelProperty(value = "列表操作按钮状态（0=显示，1=隐藏）")
+ private Integer listControlsButtonStatus;
+
+ @ApiModelProperty(value = "评价按钮状态（0=显示，1=隐藏）")
+ private Integer evaluateButtonStatus;
+
+ @ApiModelProperty(value = "语音文件集合")
+ private List<String> voiceFileList;
}
--
Gitblit v1.7.1