From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/Complaint.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 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 adaca43..67d1074 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
@@ -18,6 +18,9 @@
import lombok.experimental.Accessors;
import org.checkerframework.checker.units.qual.A;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
/**
* <p>
* 问题报告表
@@ -46,26 +49,32 @@
@ApiModelProperty(value = "问题发生时间")
@TableField("time")
+ @NotNull(message = "时间不能为空")
private Date time;
@ApiModelProperty(value = "问题类型")
@TableField("problem_type")
+ @NotBlank(message = "问题类型不能为空")
private String problemType;
@ApiModelProperty(value = "群众姓名")
@TableField("name")
+ @NotBlank(message = "群众姓名不能为空")
private String name;
@ApiModelProperty(value = "联系电话")
@TableField("contact_number")
+ @NotBlank(message = "联系电话不能为空")
private String contactNumber;
@ApiModelProperty(value = "问题发生地点")
@TableField("location")
+ @NotBlank(message = "地点不能为空")
private String location;
@ApiModelProperty(value = "详细地址描述")
@TableField("detailed_address")
+ @NotBlank(message = "详细地址不能为空")
private String detailedAddress;
@ApiModelProperty(value = "问题标题")
@@ -74,6 +83,7 @@
@ApiModelProperty(value = "问题描述内容")
@TableField("description_content")
+ @NotBlank(message = "问题描述内容不能为空")
private String descriptionContent;
@ApiModelProperty(value = "上传图片")
@@ -84,18 +94,42 @@
@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-已评价")
@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")
+ private Integer superiorType;
@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;
@@ -144,6 +178,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;
@@ -158,4 +196,11 @@
@ApiModelProperty(value = "纬度")
private BigDecimal latitude;
+ @ApiModelProperty(value = "录入人")
+ @TableField("report_user_name")
+ private String reportUserName;
+
+ @ApiModelProperty(value = "录入人联系方式")
+ @TableField("report_user_phone")
+ private String reportUserPhone;
}
--
Gitblit v1.7.1