init

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

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

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

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

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

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

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

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

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

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

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

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;
 

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

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;
 

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

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

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

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

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

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;
 

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

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

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;

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;

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

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

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

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

@@ -20,6 +20,7 @@
         <result column="valid_end_date" property="validEndDate"/>
         <result column="review_date" property="reviewDate"/>
         <result column="cert_attachment_url" property="certAttachmentUrl"/>
+        <result column="business_scope" property="businessScope"/>
         <result column="delete_enum" property="deleteEnum"/>
         <result column="remarks" property="remarks"/>
         <result column="create_name" property="createName"/>
@@ -35,7 +36,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`, `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`
     </sql>
 
 </mapper>

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

@@ -23,6 +23,7 @@
         <result property="reviewDate" column="review_date"/>
         <result property="certAttachmentUrl" column="cert_attachment_url"/>
         <result property="sourceCertId" column="source_cert_id"/>
+        <result property="businessScope" column="business_scope"/>
         <result property="deleteEnum" column="delete_enum"/>
         <result property="remarks" column="remarks"/>
         <result property="createName" column="create_name"/>
@@ -55,6 +56,7 @@
                review_date,
                cert_attachment_url,
                source_cert_id,
+               business_scope,
                delete_enum,
                remarks,
                create_name,

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

@@ -21,6 +21,7 @@
         <result column="review_date" property="reviewDate"/>
         <result column="cert_attachment_url" property="certAttachmentUrl"/>
         <result column="source_cert_id" property="sourceCertId"/>
+        <result column="business_scope" property="businessScope"/>
         <result column="delete_enum" property="deleteEnum"/>
         <result column="remarks" property="remarks"/>
         <result column="create_name" property="createName"/>
@@ -37,7 +38,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`, `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`
     </sql>
 
 </mapper>