From b088628cf9be70c36e34032bb0d024548351541b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 三月 2023 17:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java | 133 +++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 62 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java
index 12c78ec..e21402c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java
@@ -3,18 +3,17 @@
import com.baomidou.mybatisplus.enums.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
/**
* <p>
- * 投诉管理
+ * 投诉
* </p>
*
- * @author 吕雪
- * @since 2020-06-09
+ * @author stylefeng
+ * @since 2023-03-02
*/
@TableName("t_complaint")
public class TComplaint extends Model<TComplaint> {
@@ -27,49 +26,68 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
- * 用户Id
+ * 用户id
*/
private Integer userId;
+ /**
+ * 投诉司机id
+ */
+ private Integer driverId;
/**
* 投诉原因
*/
private String reason;
/**
- * 被投诉人Id
+ * 注释
*/
- private Long driverId;
+ private String notes;
/**
- * 描述
+ * 处理状态（1=待处理，2=已处理）
*/
- private String description;
+ private Integer state;
/**
- * 是否处理（0：未处理，1：已处理）
+ * 状态（1=正常，2=冻结，3=删除）
*/
- private Integer isHandle;
+ private Integer status;
/**
- * 投诉时间
+ * 添加时间
*/
- @TableField("insert_time")
- private Date insertTime;
- /**
- * 处理结果
- */
- private String handleResult;
+ private Date createTime;
/**
* 处理人id
*/
- private Integer handleUserId;
+ private Integer auditId;
+ /**
+ * 处理人名称
+ */
+ private String auditPersonName;
/**
* 处理时间
*/
- private Date handleTime;
+ private Date auditTime;
- public Date getHandleTime() {
- return handleTime;
+ public Date getAuditTime() {
+ return auditTime;
}
- public void setHandleTime(Date handleTime) {
- this.handleTime = handleTime;
+ public void setAuditTime(Date auditTime) {
+ this.auditTime = auditTime;
+ }
+
+ public Integer getAuditId() {
+ return auditId;
+ }
+
+ public void setAuditId(Integer auditId) {
+ this.auditId = auditId;
+ }
+
+ public String getAuditPersonName() {
+ return auditPersonName;
+ }
+
+ public void setAuditPersonName(String auditPersonName) {
+ this.auditPersonName = auditPersonName;
}
public Integer getId() {
@@ -88,6 +106,14 @@
this.userId = userId;
}
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
public String getReason() {
return reason;
}
@@ -96,52 +122,36 @@
this.reason = reason;
}
- public Long getDriverId() {
- return driverId;
+ public String getNotes() {
+ return notes;
}
- public void setDriverId(Long driverId) {
- this.driverId = driverId;
+ public void setNotes(String notes) {
+ this.notes = notes;
}
- public String getDescription() {
- return description;
+ public Integer getState() {
+ return state;
}
- public void setDescription(String description) {
- this.description = description;
+ public void setState(Integer state) {
+ this.state = state;
}
- public Integer getIsHandle() {
- return isHandle;
+ public Integer getStatus() {
+ return status;
}
- public void setIsHandle(Integer isHandle) {
- this.isHandle = isHandle;
+ public void setStatus(Integer status) {
+ this.status = status;
}
- public Date getInsertTime() {
- return insertTime;
+ public Date getCreateTime() {
+ return createTime;
}
- public void setInsertTime(Date insertTime) {
- this.insertTime = insertTime;
- }
-
- public String getHandleResult() {
- return handleResult;
- }
-
- public void setHandleResult(String handleResult) {
- this.handleResult = handleResult;
- }
-
- public Integer getHandleUserId() {
- return handleUserId;
- }
-
- public void setHandleUserId(Integer handleUserId) {
- this.handleUserId = handleUserId;
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
}
@Override
@@ -154,13 +164,12 @@
return "TComplaint{" +
"id=" + id +
", userId=" + userId +
- ", reason=" + reason +
", driverId=" + driverId +
- ", description=" + description +
- ", isHandle=" + isHandle +
- ", insertTime=" + insertTime +
- ", handleResult=" + handleResult +
- ", handleUserId=" + handleUserId +
+ ", reason=" + reason +
+ ", notes=" + notes +
+ ", state=" + state +
+ ", status=" + status +
+ ", createTime=" + createTime +
"}";
}
}
--
Gitblit v1.7.1