From 2f084c24fcc1c42e401edde4c8c6939d53c94764 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 25 二月 2025 00:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
index 9feb910..72251bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java
@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import java.util.Date;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -33,7 +36,8 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = " ")
- @TableId(value = "id")
+ @TableId(value = "id",type = IdType.ASSIGN_ID)
+ @JsonSerialize(using = com.fasterxml.jackson.databind.ser.std.ToStringSerializer.class)
private Long id;
@ApiModelProperty(value = "诉求号")
@@ -80,15 +84,11 @@
@TableField("videos")
private String videos;
- @ApiModelProperty(value = "审核状态：0-待审核 1-审核通过 2-审核驳回")
- @TableField("audit_status")
- private Integer auditStatus;
-
- @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结")
+ @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回")
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "上报类型 1-社区 2-街道 3-区县 4-市")
+ @ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号")
@TableField("report_type")
private Integer reportType;
@@ -134,7 +134,7 @@
@ApiModelProperty(value = "办结人员id")
@TableField("completion_user_id")
- private Integer completionUserId;
+ private Long completionUserId;
@ApiModelProperty(value = "办结人员")
@TableField("completion_username")
@@ -144,4 +144,18 @@
@TableField("completion_user_phone")
private String completionUserPhone;
+ @ApiModelProperty(value = "截止日期")
+ @TableField("closing_time")
+ private Date closingTime;
+
+ @ApiModelProperty(value = "超时天数")
+ @TableField("over_time_days")
+ private Integer overTimeDays;
+
+ @ApiModelProperty(value = "经度")
+ private BigDecimal longitude;
+
+ @ApiModelProperty(value = "纬度")
+ private BigDecimal latitude;
+
}
--
Gitblit v1.7.1