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/entity/Complaint.java | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 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 b40e67f..1d85d8d 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
@@ -1,25 +1,21 @@
package com.panzhihua.sangeshenbian.model.entity;
-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.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.checkerframework.checker.units.qual.A;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* <p>
@@ -94,13 +90,9 @@
@TableField("videos")
private String videos;
- @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核")
+ @ApiModelProperty(value = "流转状态：0-正在办理 1-延期办理 2-超时办理 3-已办结 4-群众撤销 5-上报待审核 6-上级驳回 7-延期待审核 8-已评价 9-延期驳回")
@TableField("status")
private Integer status;
-
- @ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号")
- @TableField("report_type")
- private Integer reportType;
@ApiModelProperty(value = "上级类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号")
@TableField("superior_type")
@@ -109,7 +101,31 @@
@ApiModelProperty(value = "上级id")
@TableField("superior_id")
private Long superiorId;
-
+
+ @ApiModelProperty(value = "上报类型 1=市级账号，2=区县账号，3=街道账号，4=社区账号，5=党员账号")
+ @TableField("report_type")
+ private Integer reportType;
+
+ @ApiModelProperty(value = "上报人所属市")
+ @TableField("city_code")
+ private Integer cityCode;
+
+ @ApiModelProperty(value = "上报人所属区县")
+ @TableField("districts_code")
+ private Integer districtsCode;
+
+ @ApiModelProperty(value = "上报人所属街道id")
+ @TableField("street_id")
+ private Long streetId;
+
+ @ApiModelProperty(value = "上报人所属社区id")
+ @TableField("community_id")
+ private Long communityId;
+
+ @ApiModelProperty(value = "上报党员id")
+ @TableField("party_member_id")
+ private Long partyMemberId;
+
@ApiModelProperty(value = "创建人")
@TableField("create_by")
private Long createBy;
@@ -158,6 +174,10 @@
@TableField("completion_user_phone")
private String completionUserPhone;
+ @ApiModelProperty(value = "办结人层级 1=市级账号，2=区县账号，3=街道账号，4=社区账号，5=党员账号")
+ @TableField("completion_user_level")
+ private Integer completionUserLevel;
+
@ApiModelProperty(value = "截止日期")
@TableField("closing_time")
private Date closingTime;
@@ -172,4 +192,23 @@
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
+ @ApiModelProperty(value = "录入人")
+ @TableField("report_user_name")
+ private String reportUserName;
+
+ @ApiModelProperty(value = "录入人联系方式")
+ @TableField("report_user_phone")
+ private String reportUserPhone;
+
+ @ApiModelProperty(value = "语音文件")
+ @TableField("voice_file")
+ private String voiceFile;
+
+ @ApiModelProperty(value = "处理天数")
+ @TableField("handling_day")
+ private Double handlingDay;
+
+ @ApiModelProperty(value = "评价")
+ @TableField("comment_rate")
+ private Integer commentRate;
}
--
Gitblit v1.7.1