From 3a5eb8579510327949061abdc97102807796e635 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 16 Jul 2026 11:33:42 +0800 Subject: [PATCH] init --- ...ement-org-equipment-industry-code-20260715.sql | 15 ++++++++++++++- .../QualFilingPersonnelCertChangeAddCmd.java | 6 ++++++ .../QualFilingPersonnelCertChangeUpdateCmd.java | 5 +++++ .../response/QualFilingPersonnelCertChangeCo.java | 5 +++++ .../safetyeval/client/co/OrgPersonnelCertCO.java | 3 +++ .../client/co/QualFilingPersonnelCertCO.java | 3 +++ .../client/dto/OrgPersonnelCertAddCmd.java | 4 ++++ .../client/dto/OrgPersonnelCertModifyCmd.java | 4 ++++ .../client/dto/QualFilingPersonnelCertAddCmd.java | 3 +++ .../dto/QualFilingPersonnelCertModifyCmd.java | 3 +++ .../model/QualFilingPersonnelCertChangeE.java | 4 ++++ .../domain/entity/OrgPersonnelCertEntity.java | 3 +++ .../entity/QualFilingPersonnelCertEntity.java | 3 +++ .../dataobject/OrgPersonnelCertDO.java | 1 + .../dataobject/QualFilingPersonnelCertDO.java | 1 + .../QualFilingPersonnelCertChangeDO.java | 4 ++++ .../infrastructure/utils/ComplianceCheckUtil.java | 2 +- .../resources/mapper/OrgPersonnelCertMapper.xml | 3 ++- .../QualFilingPersonnelCertChangeMapper.xml | 2 ++ .../mapper/QualFilingPersonnelCertMapper.xml | 3 ++- 20 files changed, 73 insertions(+), 4 deletions(-) diff --git a/docs/db/increment-org-equipment-industry-code-20260715.sql b/docs/db/increment-org-equipment-industry-code-20260715.sql index 08aca08..97f3bf5 100644 --- a/docs/db/increment-org-equipment-industry-code-20260715.sql +++ b/docs/db/increment-org-equipment-industry-code-20260715.sql @@ -33,4 +33,17 @@ ALTER TABLE `qual_filing_personnel_cert` -- 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 + ADD COLUMN `business_scope` varchar(500) DEFAULT NULL COMMENT '备案安全评价业务范围' AFTER `source_cert_id`; + + +-- org_personnel_cert 表添加 专业能力编码 字段 +ALTER TABLE `org_personnel_cert` + ADD COLUMN `professional_capability_code` VARCHAR(64) DEFAULT NULL COMMENT '专业能力编码' AFTER `business_scope`; + +-- qual_filing_personnel_cert 表添加 专业能力编码 字段 +ALTER TABLE `qual_filing_personnel_cert` + ADD COLUMN `professional_capability_code` VARCHAR(64) DEFAULT NULL COMMENT '专业能力编码' AFTER `business_scope`; + +-- qual_filing_personnel_cert_change 表添加 专业能力编码 字段 +ALTER TABLE `qual_filing_personnel_cert_change` + ADD COLUMN `professional_capability_code` VARCHAR(64) DEFAULT NULL COMMENT '专业能力编码' AFTER `business_scope`; \ No newline at end of file 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 7d1e844..15750b1 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 @@ -116,6 +116,12 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable { @ApiModelProperty(value = "备案安全评价业务范围") @Size(max = 500, message = "备案安全评价业务范围不能超过500个字符") private String businessScope; + /** + * 专业能力编码 + */ + @ApiModelProperty(value = "专业能力编码") + @Size(max = 64, message = "专业能力编码不能超过64个字符") + private String professionalCapabilityCode; /** * 环境 */ 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 d2d7b2b..81a6a83 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 @@ -106,6 +106,11 @@ public class QualFilingPersonnelCertChangeUpdateCmd implements Serializable { */ @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; + /** + * 专业能力编码 + */ + @ApiModelProperty(value = "专业能力编码") + private String professionalCapabilityCode; /** * 环境 */ 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 398e23e..7fccc1b 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 @@ -106,6 +106,11 @@ public class QualFilingPersonnelCertChangeCo extends ClientObject { */ @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; + /** + * 专业能力编码 + */ + @ApiModelProperty(value = "专业能力编码") + private String professionalCapabilityCode; /** * 环境 */ 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 b3748bd..46a8fbb 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 @@ -60,6 +60,9 @@ public class OrgPersonnelCertCO { @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; + @ApiModelProperty(value = "专业能力编码") + private String professionalCapabilityCode; + @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 8e30c60..4941086 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 @@ -63,6 +63,9 @@ public class QualFilingPersonnelCertCO { @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; + @ApiModelProperty(value = "专业能力编码") + private String professionalCapabilityCode; + @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 f9879ac..cdb82fb 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 @@ -66,6 +66,10 @@ public class OrgPersonnelCertAddCmd { @Size(max = 500, message = "备案安全评价业务范围不能超过500个字符") private String businessScope; + @ApiModelProperty(value = "专业能力编码") + @Size(max = 64, message = "专业能力编码不能超过64个字符") + private String professionalCapabilityCode; + @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 44cc7aa..51e1263 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 @@ -69,6 +69,10 @@ public class OrgPersonnelCertModifyCmd { @Size(max = 500, message = "备案安全评价业务范围不能超过500个字符") private String businessScope; + @ApiModelProperty(value = "专业能力编码") + @Size(max = 64, message = "专业能力编码不能超过64个字符") + private String professionalCapabilityCode; + @ApiModelProperty(value = "人员id") private Long personnelId; 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 be5eb95..f49243c 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 @@ -54,6 +54,9 @@ public class QualFilingPersonnelCertAddCmd { @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; + @ApiModelProperty(value = "专业能力编码") + private String professionalCapabilityCode; + @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 c6a019e..1d26b01 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 @@ -57,6 +57,9 @@ public class QualFilingPersonnelCertModifyCmd { @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; + @ApiModelProperty(value = "专业能力编码") + private String professionalCapabilityCode; + @ApiModelProperty(value = "租户id") private Long tenantId; } 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 452617e..1284f31 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 @@ -90,6 +90,10 @@ public class QualFilingPersonnelCertChangeE extends BaseE { * 备案安全评价业务范围 */ private String businessScope; + /** + * 专业能力编码 + */ + private String professionalCapabilityCode; /** * 环境 */ 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 312e302..05771dd 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 @@ -63,6 +63,9 @@ public class OrgPersonnelCertEntity { /** 备案安全评价业务范围 */ private String businessScope; + /** 专业能力编码 */ + private String professionalCapabilityCode; + /** 租户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 ff8d4e8..0d8725b 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 @@ -67,6 +67,9 @@ public class QualFilingPersonnelCertEntity { /** 备案安全评价业务范围 */ private String businessScope; + /** 专业能力编码 */ + private String professionalCapabilityCode; + /** 租户ID */ private Long tenantId; 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 159972b..dee2940 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 @@ -32,6 +32,7 @@ public class OrgPersonnelCertDO { private LocalDate reviewDate; private String certAttachmentUrl; private String businessScope; + private String professionalCapabilityCode; // ---- 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 599cf51..159ecc2 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 @@ -33,6 +33,7 @@ public class QualFilingPersonnelCertDO { private String certAttachmentUrl; private Long sourceCertId; private String businessScope; + private String professionalCapabilityCode; // ---- GBS默认字段 ---- private String deleteEnum; 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 e2f70fb..eaa7214 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 @@ -98,6 +98,10 @@ public class QualFilingPersonnelCertChangeDO extends BaseDO { * 备案安全评价业务范围 */ private String businessScope; + /** + * 专业能力编码 + */ + private String professionalCapabilityCode; /** * 环境 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java index 0370b24..d0dca4b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java @@ -329,7 +329,7 @@ public class ComplianceCheckUtil { Long currentPerson = currentCountMap.getOrDefault(key, 0L); if (s.getPersonNum() > currentPerson) { IndustryEnum industryEnum = IndustryEnum.ofCode(s.getIndustryCode()); - ProfessionalCapabilityEnum professionalCapabilityEnum = ProfessionalCapabilityEnum.ofCode(s.getIndustryCode()); + ProfessionalCapabilityEnum professionalCapabilityEnum = ProfessionalCapabilityEnum.ofCode(s.getProfessionalCapabilityCode()); failureMsg.append(industryEnum.getValue()) .append(":") .append(professionalCapabilityEnum.getValue()) diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml index 6fe472b..98899f8 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml @@ -21,6 +21,7 @@ + @@ -36,7 +37,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`, `business_scope`, `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`, `professional_capability_code`, `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 9be73f8..7320efd 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml @@ -24,6 +24,7 @@ + @@ -57,6 +58,7 @@ cert_attachment_url, source_cert_id, business_scope, + professional_capability_code, 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 a97f20e..0550194 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml @@ -22,6 +22,7 @@ + @@ -38,7 +39,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`, `business_scope`, `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`, `professional_capability_code`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`