From 227c03f139512aa5d5930f21f58fc03e64cae25d Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Thu, 16 Jul 2026 11:16:58 +0800
Subject: [PATCH] init
---
...t-org-equipment-industry-code-20260715.sql | 13 +++++++
.../executor/OrgPersonnelCertExecutor.java | 1 +
.../QualFilingPersonnelCertExecutor.java | 1 +
.../QualFilingOrgPersonnelImporter.java | 1 +
.../QualFilingPersonnelCertChangeAddCmd.java | 6 ++++
.../QualFilingPersonnelCertChangePageQry.java | 5 +++
...ualFilingPersonnelCertChangeUpdateCmd.java | 5 +++
.../QualFilingPersonnelCertChangeCo.java | 5 +++
.../client/co/OrgPersonnelCertCO.java | 3 ++
.../client/co/QualFilingPersonnelCertCO.java | 3 ++
.../client/dto/OrgPersonnelCertAddCmd.java | 4 +++
.../client/dto/OrgPersonnelCertModifyCmd.java | 4 +++
.../client/dto/OrgPersonnelCertPageQuery.java | 3 ++
.../dto/QualFilingPersonnelCertAddCmd.java | 3 ++
.../dto/QualFilingPersonnelCertModifyCmd.java | 3 ++
.../dto/QualFilingPersonnelCertPageQuery.java | 3 ++
.../model/QualFilingPersonnelCertChangeE.java | 4 +++
.../domain/constant/CertTypeCodeEnum.java | 36 +++++++++++++++++++
.../domain/entity/OrgPersonnelCertEntity.java | 3 ++
.../entity/QualFilingPersonnelCertEntity.java | 3 ++
.../domain/query/OrgPersonnelCertQuery.java | 3 ++
.../query/QualFilingPersonnelCertQuery.java | 3 ++
.../dataobject/OrgPersonnelCertDO.java | 1 +
.../dataobject/QualFilingPersonnelCertDO.java | 1 +
.../OrgPersonnelCertGatewayImpl.java | 2 ++
.../QualFilingPersonnelCertGatewayImpl.java | 1 +
.../QualFilingPersonnelCertChangeDO.java | 4 +++
.../mapper/OrgPersonnelCertMapper.xml | 3 +-
.../QualFilingPersonnelCertChangeMapper.xml | 2 ++
.../mapper/QualFilingPersonnelCertMapper.xml | 3 +-
30 files changed, 130 insertions(+), 2 deletions(-)
create mode 100644 safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertTypeCodeEnum.java
diff --git a/docs/db/increment-org-equipment-industry-code-20260715.sql b/docs/db/increment-org-equipment-industry-code-20260715.sql
index e137fb0..08aca08 100644
--- a/docs/db/increment-org-equipment-industry-code-20260715.sql
+++ b/docs/db/increment-org-equipment-industry-code-20260715.sql
@@ -21,3 +21,16 @@ ALTER TABLE `org_business_scope_device_ref` CHANGE COLUMN `device_code` `device_
-- 3. device_name → device_type_name 设备类型名称
ALTER TABLE `org_business_scope_device_ref` CHANGE COLUMN `device_name` `device_type_name` varchar(200) DEFAULT NULL COMMENT '设备类型名称';
+
+
+-- org_personnel_cert 表添加 business_scope 字段
+ALTER TABLE `org_personnel_cert`
+ ADD COLUMN `business_scope` varchar(500) DEFAULT NULL COMMENT '备案安全评价业务范围' AFTER `cert_attachment_url`;
+
+-- qual_filing_personnel_cert 表添加 business_scope 字段
+ALTER TABLE `qual_filing_personnel_cert`
+ ADD COLUMN `business_scope` varchar(500) DEFAULT NULL COMMENT '备案安全评价业务范围' AFTER `source_cert_id`;
+
+-- qual_filing_personnel_cert_change 表添加 business_scope 字段
+ALTER TABLE `qual_filing_personnel_cert_change`
+ ADD COLUMN `business_scope` varchar(500) DEFAULT NULL COMMENT '备案安全评价业务范围' AFTER `source_cert_id`;
\ No newline at end of file
diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java
index 24da97c..5d3697b 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java
@@ -129,6 +129,7 @@ public class OrgPersonnelCertExecutor implements OrgPersonnelCertApi {
co.setValidEndDate(entity.getValidEndDate());
co.setReviewDate(entity.getReviewDate());
co.setCertAttachmentUrl(entity.getCertAttachmentUrl());
+ co.setBusinessScope(entity.getBusinessScope());
co.setTenantId(entity.getTenantId());
return co;
}
diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java
index f67f8d9..76c4593 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java
@@ -123,6 +123,7 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA
co.setValidEndDate(entity.getValidEndDate());
co.setReviewDate(entity.getReviewDate());
co.setCertAttachmentUrl(entity.getCertAttachmentUrl());
+ co.setBusinessScope(entity.getBusinessScope());
co.setTenantId(entity.getTenantId());
return co;
}
diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java
index ebbc97f..e3448bf 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java
@@ -114,6 +114,7 @@ public class QualFilingOrgPersonnelImporter {
entity.setValidEndDate(source.getValidEndDate());
entity.setReviewDate(source.getReviewDate());
entity.setCertAttachmentUrl(source.getCertAttachmentUrl());
+ entity.setBusinessScope(source.getBusinessScope());
return entity;
}
}
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java
index 83504f1..7d1e844 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java
@@ -110,6 +110,12 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable {
*/
@ApiModelProperty(value = "来源人员证书id")
private Long sourceCertId;
+ /**
+ * 备案安全评价业务范围
+ */
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ @Size(max = 500, message = "备案安全评价业务范围不能超过500个字符")
+ private String businessScope;
/**
* 环境
*/
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java
index 055eede..3efbe41 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangePageQry.java
@@ -96,6 +96,11 @@ public class QualFilingPersonnelCertChangePageQry extends PageQuery {
*/
@ApiModelProperty(value = "来源人员证书id")
private Long sourceCertId;
+ /**
+ * 备案安全评价业务范围
+ */
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
/**
* 环境
*/
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java
index 24e6a04..d2d7b2b 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java
@@ -101,6 +101,11 @@ public class QualFilingPersonnelCertChangeUpdateCmd implements Serializable {
*/
@ApiModelProperty(value = "来源人员证书id")
private Long sourceCertId;
+ /**
+ * 备案安全评价业务范围
+ */
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
/**
* 环境
*/
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java
index 0bd8a8d..398e23e 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java
@@ -101,6 +101,11 @@ public class QualFilingPersonnelCertChangeCo extends ClientObject {
*/
@ApiModelProperty(value = "来源人员证书id")
private Long sourceCertId;
+ /**
+ * 备案安全评价业务范围
+ */
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
/**
* 环境
*/
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java
index 19a3057..b3748bd 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java
@@ -57,6 +57,9 @@ public class OrgPersonnelCertCO {
@ApiModelProperty(value = "证书附件地址")
private String certAttachmentUrl;
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
+
@ApiModelProperty(value = "租户ID")
private Long tenantId;
}
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java
index 75ea073..8e30c60 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java
@@ -60,6 +60,9 @@ public class QualFilingPersonnelCertCO {
@ApiModelProperty(value = "证书附件地址")
private String certAttachmentUrl;
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
+
@ApiModelProperty(value = "租户ID")
private Long tenantId;
}
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java
index d67ab21..f9879ac 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java
@@ -62,6 +62,10 @@ public class OrgPersonnelCertAddCmd {
@Size(max = 500, message = "证书附件地址不能超过500个字符")
private String certAttachmentUrl;
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ @Size(max = 500, message = "备案安全评价业务范围不能超过500个字符")
+ private String businessScope;
+
@ApiModelProperty(value = "人员id")
private Long personnelId;
}
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java
index 5084839..44cc7aa 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java
@@ -65,6 +65,10 @@ public class OrgPersonnelCertModifyCmd {
@Size(max = 500, message = "证书附件地址不能超过500个字符")
private String certAttachmentUrl;
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ @Size(max = 500, message = "备案安全评价业务范围不能超过500个字符")
+ private String businessScope;
+
@ApiModelProperty(value = "人员id")
private Long personnelId;
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertPageQuery.java
index 212c7f5..2199bec 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertPageQuery.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertPageQuery.java
@@ -33,4 +33,7 @@ public class OrgPersonnelCertPageQuery extends BasePageQuery {
@ApiModelProperty(value = "证书作业类别名称")
private String operationCategoryName;
+
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
}
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java
index 44717c8..be5eb95 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java
@@ -51,6 +51,9 @@ public class QualFilingPersonnelCertAddCmd {
@ApiModelProperty(value = "证书附件地址")
private String certAttachmentUrl;
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
+
@ApiModelProperty(value = "来源证件ID")
private Long sourceCertId;
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java
index f5cf96d..c6a019e 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java
@@ -54,6 +54,9 @@ public class QualFilingPersonnelCertModifyCmd {
@ApiModelProperty(value = "证书附件地址")
private String certAttachmentUrl;
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
+
@ApiModelProperty(value = "租户id")
private Long tenantId;
}
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertPageQuery.java
index f726dfd..fd8b10e 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertPageQuery.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertPageQuery.java
@@ -21,4 +21,7 @@ public class QualFilingPersonnelCertPageQuery extends BasePageQuery {
@ApiModelProperty(value = "证照名称")
private String certName;
+
+ @ApiModelProperty(value = "备案安全评价业务范围")
+ private String businessScope;
}
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java
index 7a10a74..452617e 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java
@@ -86,6 +86,10 @@ public class QualFilingPersonnelCertChangeE extends BaseE {
* 来源人员证书id
*/
private Long sourceCertId;
+ /**
+ * 备案安全评价业务范围
+ */
+ private String businessScope;
/**
* 环境
*/
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertTypeCodeEnum.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertTypeCodeEnum.java
new file mode 100644
index 0000000..ecc291d
--- /dev/null
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/CertTypeCodeEnum.java
@@ -0,0 +1,36 @@
+package org.qinan.safetyeval.domain.constant;
+
+import java.util.Objects;
+
+/**
+ * 证书类型编码
+ */
+public enum CertTypeCodeEnum {
+
+ REGISTERED_SAFETY_ENGINEER("注册安全工程师"),
+ SENIOR_ENGINEER("高工"),
+ EVALUATOR("评价师"),
+ ;
+
+ private final String code;
+
+ CertTypeCodeEnum(String code) {
+ this.code = code;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public static CertTypeCodeEnum ofCode(String code) {
+ if (code == null) {
+ return null;
+ }
+ for (CertTypeCodeEnum item : values()) {
+ if (Objects.equals(item.code, code)) {
+ return item;
+ }
+ }
+ return null;
+ }
+}
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java
index 5fdb445..312e302 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java
@@ -60,6 +60,9 @@ public class OrgPersonnelCertEntity {
/** 证书附件地址 */
private String certAttachmentUrl;
+ /** 备案安全评价业务范围 */
+ private String businessScope;
+
/** 租户ID */
private Long tenantId;
}
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java
index ce83b23..ff8d4e8 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java
@@ -64,6 +64,9 @@ public class QualFilingPersonnelCertEntity {
/** 来源人员证书ID */
private Long sourceCertId;
+ /** 备案安全评价业务范围 */
+ private String businessScope;
+
/** 租户ID */
private Long tenantId;
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgPersonnelCertQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgPersonnelCertQuery.java
index 7e33356..704f897 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgPersonnelCertQuery.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgPersonnelCertQuery.java
@@ -39,4 +39,7 @@ public class OrgPersonnelCertQuery {
/** 证书作业类别名称 */
private String operationCategoryName;
+
+ /** 备案安全评价业务范围 */
+ private String businessScope;
}
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingPersonnelCertQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingPersonnelCertQuery.java
index 2a4a51e..b7b0294 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingPersonnelCertQuery.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/QualFilingPersonnelCertQuery.java
@@ -27,4 +27,7 @@ public class QualFilingPersonnelCertQuery {
/** 证书名称 */
private String certName;
+
+ /** 备案安全评价业务范围 */
+ private String businessScope;
}
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java
index 4dcf0cd..159972b 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java
@@ -31,6 +31,7 @@ public class OrgPersonnelCertDO {
private LocalDate validEndDate;
private LocalDate reviewDate;
private String certAttachmentUrl;
+ private String businessScope;
// ---- GBS默认字段 ----
private String deleteEnum;
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java
index 45c652d..599cf51 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java
@@ -32,6 +32,7 @@ public class QualFilingPersonnelCertDO {
private LocalDate reviewDate;
private String certAttachmentUrl;
private Long sourceCertId;
+ private String businessScope;
// ---- GBS默认字段 ----
private String deleteEnum;
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelCertGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelCertGatewayImpl.java
index 9041ed4..dd5df5d 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelCertGatewayImpl.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelCertGatewayImpl.java
@@ -131,6 +131,7 @@ public class OrgPersonnelCertGatewayImpl implements OrgPersonnelCertGateway {
dataObject.setValidEndDate(entity.getValidEndDate());
dataObject.setReviewDate(entity.getReviewDate());
dataObject.setCertAttachmentUrl(entity.getCertAttachmentUrl());
+ dataObject.setBusinessScope(entity.getBusinessScope());
dataObject.setTenantId(entity.getTenantId());
return dataObject;
}
@@ -155,6 +156,7 @@ public class OrgPersonnelCertGatewayImpl implements OrgPersonnelCertGateway {
entity.setValidEndDate(dataObject.getValidEndDate());
entity.setReviewDate(dataObject.getReviewDate());
entity.setCertAttachmentUrl(dataObject.getCertAttachmentUrl());
+ entity.setBusinessScope(dataObject.getBusinessScope());
entity.setTenantId(dataObject.getTenantId());
return entity;
}
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java
index d0cba2d..9173675 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java
@@ -142,6 +142,7 @@ public class QualFilingPersonnelCertGatewayImpl implements QualFilingPersonnelCe
entity.setReviewDate(dataObject.getReviewDate());
entity.setCertAttachmentUrl(dataObject.getCertAttachmentUrl());
entity.setSourceCertId(dataObject.getSourceCertId());
+ entity.setBusinessScope(dataObject.getBusinessScope());
entity.setTenantId(dataObject.getTenantId());
return entity;
}
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java
index 89c1c27..e2f70fb 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java
@@ -94,6 +94,10 @@ public class QualFilingPersonnelCertChangeDO extends BaseDO {
* 来源人员证书id
*/
private Long sourceCertId;
+ /**
+ * 备案安全评价业务范围
+ */
+ private String businessScope;
/**
* 环境
*/
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml
index aa33ced..6fe472b 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml
@@ -20,6 +20,7 @@
+
@@ -35,7 +36,7 @@
- `id`, `org_id`, `personnel_id`, `cert_name`, `cert_type_code`, `cert_type_name`, `cert_category_code`, `cert_category_name`, `operation_category_code`, `operation_category_name`, `cert_no`, `issue_org`, `valid_start_date`, `valid_end_date`, `review_date`, `cert_attachment_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
+ `id`, `org_id`, `personnel_id`, `cert_name`, `cert_type_code`, `cert_type_name`, `cert_category_code`, `cert_category_name`, `operation_category_code`, `operation_category_name`, `cert_no`, `issue_org`, `valid_start_date`, `valid_end_date`, `review_date`, `cert_attachment_url`, `business_scope`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml
index aa7ccfd..9be73f8 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml
@@ -23,6 +23,7 @@
+
@@ -55,6 +56,7 @@
review_date,
cert_attachment_url,
source_cert_id,
+ business_scope,
delete_enum,
remarks,
create_name,
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml
index bf3368c..a97f20e 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml
@@ -21,6 +21,7 @@
+
@@ -37,7 +38,7 @@
- `id`, `filing_id`, `filing_personnel_id`, `cert_name`, `cert_type_code`, `cert_type_name`, `cert_category_code`, `cert_category_name`, `operation_category_code`, `operation_category_name`, `cert_no`, `issue_org`, `valid_start_date`, `valid_end_date`, `review_date`, `cert_attachment_url`, `source_cert_id`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
+ `id`, `filing_id`, `filing_personnel_id`, `cert_name`, `cert_type_code`, `cert_type_name`, `cert_category_code`, `cert_category_name`, `operation_category_code`, `operation_category_name`, `cert_no`, `issue_org`, `valid_start_date`, `valid_end_date`, `review_date`, `cert_attachment_url`, `source_cert_id`, `business_scope`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`