From 9a8a4a431c61d22a334003b2e8a52571ea809920 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Mon, 24 Mar 2025 13:15:34 +0800
Subject: [PATCH] 增加业务类别
---
assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java
index 51943af..4a38100 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/domain/SysAgency.java
@@ -1,17 +1,18 @@
package com.gkhy.assess.system.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.gkhy.assess.common.annotation.DataDesensitizationType;
import com.gkhy.assess.common.domain.BaseEntity;
+import com.gkhy.assess.common.enums.SensitiveTypeEnum;
import com.gkhy.assess.common.validate.AgencyGroup;
+import com.gkhy.assess.common.validate.ExpertGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -23,6 +24,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
@@ -49,6 +51,7 @@
@NotBlank(message = "机构名称不能为空")
+ @Length(min = 1, max = 50, message = "机构名称不能超过50个字符")
@ApiModelProperty("机构名称")
@TableField("name")
private String name;
@@ -71,7 +74,7 @@
private String province;
- @NotBlank(message = "市不能为空")
+ // @NotBlank(message = "市不能为空")
@ApiModelProperty(value = "市",required = true)
@TableField("city")
private String city;
@@ -83,6 +86,7 @@
@NotBlank(message = "经营地址不能为空")
+ @Length(min = 1, max = 100, message = "经营地址不能超过100个字符")
@ApiModelProperty(value = "经营地址",required = true)
@TableField("address")
private String address;
@@ -98,8 +102,10 @@
private String legalPerson;
+ @DataDesensitizationType(type = SensitiveTypeEnum.MOBILE_PHONE)
@NotBlank(message = "法人电话不能为空")
@Length(min = 11, max = 11, message = "手机号只能为11位")
+ @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
@ApiModelProperty(value = "法人电话",required = true)
@TableField("legal_phone")
private String legalPhone;
@@ -110,33 +116,40 @@
@TableField("manager")
private String manager;
-
+ @DataDesensitizationType(type = SensitiveTypeEnum.MOBILE_PHONE)
@NotBlank(message = "负责人电话不能为空")
@Length(min = 11, max = 11, message = "手机号只能为11位")
+ @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误！")
@ApiModelProperty(value = "负责人电话",required = true)
@TableField("manager_phone")
private String managerPhone;
@NotBlank(message = "资质证书编号不能为空")
+ @Length(min = 1, max = 20, message = "资质证书编号不能超过20位")
@ApiModelProperty(value = "资质证书编号",required = true)
@TableField("cert_number")
private String certNumber;
+
+ @NotNull(message = "资质证书图片路径不能为空")
+ @ApiModelProperty("资质证书图片路径，创建机构时传入")
+ @TableField("cert_path")
+ private String certPath;
@NotNull(message = "发证日期不能为空")
@ApiModelProperty(value = "发证日期",required = true)
@TableField("issue_date")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime issueDate;
@NotNull(message = "有效日期不能为空")
@ApiModelProperty(value = "有效日期",required = true)
@TableField("valid_date")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime validDate;
@@ -159,6 +172,7 @@
@NotBlank(message = "注册地址不能为空")
+ @Length(min = 1, max = 100, message = "注册地址不能超过100个字符")
@ApiModelProperty(value = "注册地址",required = true)
@TableField("reg_address")
private String regAddress;
@@ -170,7 +184,7 @@
private String business;
- @NotBlank(message = "机构信息上报表存放路径不能为空")
+// @NotBlank(message = "机构信息上报表存放路径不能为空")
@ApiModelProperty(value = "机构信息上报表存放路径",required = true)
@TableField("report_path")
private String reportPath;
@@ -191,4 +205,16 @@
@TableField(exist = false)
private SysUser user;
+ @Version
+ @ApiModelProperty("乐观锁")
+ @TableField("version")
+ private Integer version;
+
+ @NotBlank(message = "业务类型不能为空")
+ @ApiModelProperty(value = "业务类型1安全评价2检验检测,多个逗号隔开",required = true)
+ @TableField("business_type")
+ private String businessType;
+
+
+
}
--
Gitblit v1.9.2