init

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`;

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
     /**
      * 环境
      */

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
     /**
      * 环境
      */

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
     /**
      * 环境
      */

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
 
     @ApiModelProperty(value = "租户ID")
     private Long tenantId;

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;
 }

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
 
     @ApiModelProperty(value = "租户ID")
     private Long tenantId;

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
 
     @ApiModelProperty(value = "人员id")
     private Long personnelId;

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
 
     @ApiModelProperty(value = "人员id")
     private Long personnelId;

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
 
     @ApiModelProperty(value = "来源证件ID")
     private Long sourceCertId;

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")
+    @ApiModelProperty(value = "行业专业标准ID")
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
 
     @ApiModelProperty(value = "租户id")
     private Long tenantId;

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;
     /**
      * 环境
      */

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelCertEntity.java

@@ -66,8 +66,8 @@ public class OrgPersonnelCertEntity {
     /** 专业能力编码 */
     private String professionalCapabilityCode;
 
-    /** 专业能力ID */
+    /** 行业专业标准ID */
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
 
     /** 租户ID */
     private Long tenantId;

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelCertEntity.java

@@ -70,8 +70,8 @@ public class QualFilingPersonnelCertEntity {
     /** 专业能力编码 */
     private String professionalCapabilityCode;
 
-    /** 专业能力ID */
+    /** 行业专业标准ID */
-    private Long professionalCapabilityId;
+    private Long industryProfessionalStandardsId;
 
     /** 租户ID */
     private Long tenantId;

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;

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;

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;
     /**
      * 环境
      */

safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java

@@ -89,7 +89,7 @@ public class ComplianceCheckUtil {
      * 查询人员证书专业能力信息
      * <p>
      * 根据备案人员列表中的 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 人员证书专业能力信息列表

safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml

@@ -22,7 +22,7 @@
         <result column="cert_attachment_url" property="certAttachmentUrl"/>
         <result column="business_scope" property="businessScope"/>
         <result column="professional_capability_code" property="professionalCapabilityCode"/>
-        <result column="professional_capability_id" property="professionalCapabilityId"/>
+        <result column="industry_professional_standards_id" property="industryProfessionalStandardsId"/>
         <result column="delete_enum" property="deleteEnum"/>
         <result column="remarks" property="remarks"/>
         <result column="create_name" property="createName"/>
@@ -38,7 +38,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        `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`, `professional_capability_id`, `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`, `industry_professional_standards_id`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
     </sql>
 
     <!-- 根据人员id列表查询证书专业能力信息 -->
@@ -47,7 +47,7 @@
         SELECT personnel_id,
                business_scope,
                professional_capability_code,
-               professional_capability_id
+               industry_professional_standards_id
         FROM org_personnel_cert
         WHERE delete_enum = 'false'
         AND personnel_id IN
@@ -76,12 +76,12 @@
                opc.cert_attachment_url,
                opc.business_scope,
                opc.professional_capability_code,
-               opc.professional_capability_id,
+               opc.industry_professional_standards_id,
                opc.tenant_id,
                ips.professional_capability_name
         FROM org_personnel_cert opc
         LEFT JOIN industry_professional_standards ips
-            ON ips.id = opc.professional_capability_id
+            ON ips.id = opc.industry_professional_standards_id
            AND ips.delete_enum = 'false'
         WHERE opc.delete_enum = 'false'
           AND opc.id = #{id}

safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml

@@ -59,7 +59,7 @@
                source_cert_id,
                business_scope,
                professional_capability_code,
-               professional_capability_id,
+               industry_professional_standards_id,
                delete_enum,
                remarks,
                create_name,

safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml

@@ -39,7 +39,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        `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`, `professional_capability_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`, `professional_capability_code`, `industry_professional_standards_id`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`
     </sql>
 
 </mapper>