From 04454600a752cd6ad191f3fffcadead80da84ea6 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 16 Jul 2026 17:02:14 +0800 Subject: [PATCH] init --- ...ncrement-org-equipment-industry-code-20260715.sql | 12 ++++++------ .../request/QualFilingPersonnelCertChangeAddCmd.java | 6 +++--- .../QualFilingPersonnelCertChangeUpdateCmd.java | 6 +++--- .../response/QualFilingPersonnelCertChangeCo.java | 6 +++--- .../safetyeval/client/co/OrgPersonnelCertCO.java | 4 ++-- .../OrgPersonnelCertCapabilityComplianceCheckCO.java | 4 ++-- .../client/co/QualFilingPersonnelCertCO.java | 4 ++-- .../client/dto/OrgPersonnelCertAddCmd.java | 4 ++-- .../client/dto/OrgPersonnelCertModifyCmd.java | 4 ++-- .../client/dto/QualFilingPersonnelCertAddCmd.java | 4 ++-- .../client/dto/QualFilingPersonnelCertModifyCmd.java | 4 ++-- .../change/model/QualFilingPersonnelCertChangeE.java | 4 ++-- .../domain/entity/OrgPersonnelCertEntity.java | 4 ++-- .../domain/entity/QualFilingPersonnelCertEntity.java | 4 ++-- .../dataobject/OrgPersonnelCertDO.java | 2 +- .../dataobject/QualFilingPersonnelCertDO.java | 2 +- .../QualFilingPersonnelCertChangeDO.java | 4 ++-- .../infrastructure/utils/ComplianceCheckUtil.java | 2 +- .../main/resources/mapper/OrgPersonnelCertMapper.xml | 10 +++++----- .../mapper/QualFilingPersonnelCertChangeMapper.xml | 2 +- .../mapper/QualFilingPersonnelCertMapper.xml | 2 +- 21 files changed, 47 insertions(+), 47 deletions(-) diff --git a/docs/db/increment-org-equipment-industry-code-20260715.sql b/docs/db/increment-org-equipment-industry-code-20260715.sql index 19fe43f..5d6ab1c 100644 --- a/docs/db/increment-org-equipment-industry-code-20260715.sql +++ b/docs/db/increment-org-equipment-industry-code-20260715.sql @@ -48,17 +48,17 @@ ALTER TABLE `qual_filing_personnel_cert` ALTER TABLE `qual_filing_personnel_cert_change` ADD COLUMN `professional_capability_code` VARCHAR(64) DEFAULT NULL COMMENT '专业能力编码' AFTER `business_scope`; --- 1. org_personnel_cert 表添加专业能力ID字段 +-- 1. org_personnel_cert 表添加行业专业标准ID字段 ALTER TABLE `org_personnel_cert` - ADD COLUMN `professional_capability_id` BIGINT DEFAULT NULL COMMENT '专业能力ID' + ADD COLUMN `industry_professional_standards_id` BIGINT DEFAULT NULL COMMENT '行业专业标准ID' AFTER `professional_capability_code`; --- 2. qual_filing_personnel_cert 表添加专业能力ID字段 +-- 2. qual_filing_personnel_cert 表添加行业专业标准ID字段 ALTER TABLE `qual_filing_personnel_cert` - ADD COLUMN `professional_capability_id` BIGINT DEFAULT NULL COMMENT '专业能力ID' + ADD COLUMN `industry_professional_standards_id` BIGINT DEFAULT NULL COMMENT '行业专业标准ID' AFTER `professional_capability_code`; --- 3. qual_filing_personnel_cert_change 表添加专业能力ID字段 +-- 3. qual_filing_personnel_cert_change 表添加行业专业标准ID字段 ALTER TABLE `qual_filing_personnel_cert_change` - ADD COLUMN `professional_capability_id` BIGINT DEFAULT NULL COMMENT '专业能力ID' + ADD COLUMN `industry_professional_standards_id` BIGINT DEFAULT NULL COMMENT '行业专业标准ID' AFTER `professional_capability_code`; \ 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 79d3a0e..4f4153a 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 @@ -123,10 +123,10 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable { @Size(max = 64, message = "专业能力编码不能超过64个字符") private String professionalCapabilityCode; /** - * 专业能力ID + * 行业专业标准ID */ - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; /** * 环境 */ 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 bf8746f..6820771 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 @@ -112,10 +112,10 @@ public class QualFilingPersonnelCertChangeUpdateCmd implements Serializable { @ApiModelProperty(value = "专业能力编码") private String professionalCapabilityCode; /** - * 专业能力ID + * 行业专业标准ID */ - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; /** * 环境 */ 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 663dd37..5eec800 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 @@ -112,10 +112,10 @@ public class QualFilingPersonnelCertChangeCo extends ClientObject { @ApiModelProperty(value = "专业能力编码") private String professionalCapabilityCode; /** - * 专业能力ID + * 行业专业标准ID */ - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; /** * 环境 */ 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 f07fd54..dcbdd60 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 @@ -63,8 +63,8 @@ public class OrgPersonnelCertCO { @ApiModelProperty(value = "专业能力编码") private String professionalCapabilityCode; - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; @ApiModelProperty(value = "租户ID") private Long tenantId; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCapabilityComplianceCheckCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCapabilityComplianceCheckCO.java index e975b1b..284b96c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCapabilityComplianceCheckCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCapabilityComplianceCheckCO.java @@ -26,7 +26,7 @@ public class OrgPersonnelCertCapabilityComplianceCheckCO { private String professionalCapabilityCode; /** - * 专业能力ID + * 行业专业标准ID */ - private Long professionalCapabilityId; + private Long industryProfessionalStandardsId; } 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 31e02ca..6467a00 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 @@ -66,8 +66,8 @@ public class QualFilingPersonnelCertCO { @ApiModelProperty(value = "专业能力编码") private String professionalCapabilityCode; - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; @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 9182a0a..d8d3134 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 @@ -70,8 +70,8 @@ public class OrgPersonnelCertAddCmd { @Size(max = 64, message = "专业能力编码不能超过64个字符") private String professionalCapabilityCode; - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; @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 a33b33b..0b721fc 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 @@ -73,8 +73,8 @@ public class OrgPersonnelCertModifyCmd { @Size(max = 64, message = "专业能力编码不能超过64个字符") private String professionalCapabilityCode; - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; @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 50a8907..e5f56e9 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 @@ -57,8 +57,8 @@ public class QualFilingPersonnelCertAddCmd { @ApiModelProperty(value = "专业能力编码") private String professionalCapabilityCode; - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; @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 a1eac86..9e8077c 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 @@ -60,8 +60,8 @@ public class QualFilingPersonnelCertModifyCmd { @ApiModelProperty(value = "专业能力编码") private String professionalCapabilityCode; - @ApiModelProperty(value = "专业能力ID") - private Long professionalCapabilityId; + @ApiModelProperty(value = "行业专业标准ID") + private Long industryProfessionalStandardsId; @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 cfa0e6d..485c2f7 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 @@ -95,9 +95,9 @@ public class QualFilingPersonnelCertChangeE extends BaseE { */ private String professionalCapabilityCode; /** - * 专业能力ID + * 行业专业标准ID */ - private Long professionalCapabilityId; + private Long industryProfessionalStandardsId; /** * 环境 */ 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 6e85a97..339251b 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 @@ -66,8 +66,8 @@ public class OrgPersonnelCertEntity { /** 专业能力编码 */ private String professionalCapabilityCode; - /** 专业能力ID */ - private Long professionalCapabilityId; + /** 行业专业标准ID */ + private Long industryProfessionalStandardsId; /** 租户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 add11f7..4e78435 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 @@ -70,8 +70,8 @@ public class QualFilingPersonnelCertEntity { /** 专业能力编码 */ private String professionalCapabilityCode; - /** 专业能力ID */ - private Long professionalCapabilityId; + /** 行业专业标准ID */ + private Long industryProfessionalStandardsId; /** 租户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 bff9ec6..f5eb421 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 @@ -33,7 +33,7 @@ public class OrgPersonnelCertDO { private String certAttachmentUrl; private String businessScope; private String professionalCapabilityCode; - private Long professionalCapabilityId; + private Long industryProfessionalStandardsId; // ---- 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 e74137f..7417873 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 @@ -34,7 +34,7 @@ public class QualFilingPersonnelCertDO { private Long sourceCertId; private String businessScope; private String professionalCapabilityCode; - private Long professionalCapabilityId; + private Long industryProfessionalStandardsId; // ---- 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 b18311b..4f029f7 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 @@ -103,9 +103,9 @@ public class QualFilingPersonnelCertChangeDO extends BaseDO { */ private String professionalCapabilityCode; /** - * 专业能力ID + * 行业专业标准ID */ - private Long professionalCapabilityId; + private Long industryProfessionalStandardsId; /** * 环境 */ 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 75a2d78..c6df836 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 @@ -89,7 +89,7 @@ public class ComplianceCheckUtil { * 查询人员证书专业能力信息 *
* 根据备案人员列表中的 sourcePersonnelId(对应 org_personnel_cert.personnel_id),
- * 查询 org_personnel_cert 表的 business_scope、professional_capability_code、professional_capability_id。
+ * 查询 org_personnel_cert 表的 business_scope、professional_capability_code、industry_professional_standards_id。
*
* @param personnelList 备案人员列表
* @return 人员证书专业能力信息列表
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml
index b1da090..d3c37cf 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml
@@ -22,7 +22,7 @@