From 039abee6b27058ca46b1e1e82aa0b5407a5dad44 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 28 七月 2025 15:25:26 +0800
Subject: [PATCH] 优化 和修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/model/entity/Complaint.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/model/entity/Complaint.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/model/entity/Complaint.java
index bc6df59..430916a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/model/entity/Complaint.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/model/entity/Complaint.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -46,19 +47,19 @@
@ApiModelProperty(value = "问题发生时间")
@TableField("time")
@NotNull(message = "时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date time;
- @ApiModelProperty(value = "问题类型")
+ @ApiModelProperty(value = "问题类型（事件类型）")
@TableField("problem_type")
- @NotBlank(message = "问题类型不能为空")
private String problemType;
- @ApiModelProperty(value = "群众姓名")
+ @ApiModelProperty(value = "群众姓名（诉求人）")
@TableField("name")
@NotBlank(message = "群众姓名不能为空")
private String name;
- @ApiModelProperty(value = "联系电话")
+ @ApiModelProperty(value = "联系电话（诉求人类型电话）")
@TableField("contact_number")
@NotBlank(message = "联系电话不能为空")
private String contactNumber;
@@ -68,7 +69,7 @@
@NotBlank(message = "地点不能为空")
private String location;
- @ApiModelProperty(value = "详细地址描述")
+ @ApiModelProperty(value = "详细地址描述（事件地点）")
@TableField("detailed_address")
@NotBlank(message = "详细地址不能为空")
private String detailedAddress;
@@ -90,7 +91,7 @@
@TableField("videos")
private String videos;
- @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核 8-已评价 9-延期驳回")
+ @ApiModelProperty(value = "流转状态： -2待审核 -1待分配 0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核 8-已评价 9-延期驳回")
@TableField("status")
private Integer status;
@@ -101,6 +102,10 @@
@ApiModelProperty(value = "上级id")
@TableField("superior_id")
private Long superiorId;
+
+ @ApiModelProperty(value = "上报前上级id")
+ @TableField("last_superior_id")
+ private Long lastSuperiorId;
@ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号，5=党员账号")
@TableField("report_type")
@@ -130,8 +135,9 @@
@TableField("create_by")
private Long createBy;
- @ApiModelProperty(value = "创建时间")
+ @ApiModelProperty(value = "创建时间（（report_type 2-4 显示 接件时间））")
@TableField("create_time")
+ @JsonFormat (pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(value = "修改人")
@@ -192,11 +198,11 @@
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
- @ApiModelProperty(value = "录入人")
+ @ApiModelProperty(value = "录入人（report_type 2-4 显示 接件人）")
@TableField("report_user_name")
private String reportUserName;
- @ApiModelProperty(value = "录入人联系方式")
+ @ApiModelProperty(value = "录入人联系方式（report_type 2-4 显示 接件人电话）")
@TableField("report_user_phone")
private String reportUserPhone;
@@ -211,4 +217,55 @@
@ApiModelProperty(value = "评价")
@TableField("comment_rate")
private Integer commentRate;
+
+ @ApiModelProperty(value = "处理人id")
+ @TableField("handle_user_id")
+ private Integer handleUserId;
+
+ @ApiModelProperty(value = "分配人id")
+ @TableField("assign_person_id")
+ private Integer assignPersonId;
+
+ @ApiModelProperty(value = "分配状态 0待分配 1已分配")
+ @TableField("assign_status")
+ private Integer assignStatus;
+
+ /**
+ * 用于用户提交后续是否处理
+ */
+ @TableField("first_status")
+ @ApiModelProperty(value = "0未处理 1已处理")
+ private Integer firstStatus;
+
+ @TableField("now_level")
+ @ApiModelProperty(value = "当前层级")
+ private Integer nowLevel;
+
+
+ @TableField("last_level")
+ @ApiModelProperty(value = "上报前层级")
+ private Integer lastLevel;
+
+
+ @ApiModelProperty("分配说明")
+ private String remark;
+
+
+ @ApiModelProperty("当前层级时间")
+ @TableField("now_level_time")
+ private Date nowLevelTime;
+
+
+ @ApiModelProperty("是否重新派单 0否 1是")
+ @TableField("redispatch")
+ private Integer redispatch;
+
+
+ @ApiModelProperty("是否发送短信 0否 1是")
+ @TableField("now_level_sms")
+ private Integer nowLevelSms;
+
+
+ @TableField("house_id")
+ private Long houseId;
}
--
Gitblit v1.7.1