cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init

dev_1.0.1
luotaiqian 2026-07-16 11:33:42 +08:00
parent 4bfd4402f5
commit 3a5eb85795
20 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/db/increment-org-equipment-industry-code-20260715.sql
View File

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

6
safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeAddCmd.java
View File

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

5
safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelCertChangeUpdateCmd.java
View File

@ -106,6 +106,11 @@ public class QualFilingPersonnelCertChangeUpdateCmd implements Serializable {
*/
@ApiModelProperty(value = "备案安全评价业务范围")
private String businessScope;
/**
* 专业能力编码
*/
@ApiModelProperty(value = "专业能力编码")
private String professionalCapabilityCode;
/**
* 环境
*/

5
safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelCertChangeCo.java
View File

@ -106,6 +106,11 @@ public class QualFilingPersonnelCertChangeCo extends ClientObject {
*/
@ApiModelProperty(value = "备案安全评价业务范围")
private String businessScope;
/**
* 专业能力编码
*/
@ApiModelProperty(value = "专业能力编码")
private String professionalCapabilityCode;
/**
* 环境
*/

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCertCO.java
View File

@ -60,6 +60,9 @@ public class OrgPersonnelCertCO {
@ApiModelProperty(value = "备案安全评价业务范围")
private String businessScope;
@ApiModelProperty(value = "专业能力编码")
private String professionalCapabilityCode;
@ApiModelProperty(value = "租户ID")
private Long tenantId;
}

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCertCO.java
View File

@ -63,6 +63,9 @@ public class QualFilingPersonnelCertCO {
@ApiModelProperty(value = "备案安全评价业务范围")
private String businessScope;
@ApiModelProperty(value = "专业能力编码")
private String professionalCapabilityCode;
@ApiModelProperty(value = "租户ID")
private Long tenantId;
}

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertAddCmd.java
View File

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

4
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelCertModifyCmd.java
View File

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

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertAddCmd.java
View File

@ -54,6 +54,9 @@ public class QualFilingPersonnelCertAddCmd {
@ApiModelProperty(value = "备案安全评价业务范围")
private String businessScope;
@ApiModelProperty(value = "专业能力编码")
private String professionalCapabilityCode;
@ApiModelProperty(value = "来源证件ID")
private Long sourceCertId;

3
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelCertModifyCmd.java
View File

@ -57,6 +57,9 @@ public class QualFilingPersonnelCertModifyCmd {
@ApiModelProperty(value = "备案安全评价业务范围")
private String businessScope;
@ApiModelProperty(value = "专业能力编码")
private String professionalCapabilityCode;
@ApiModelProperty(value = "租户id")
private Long tenantId;
}

4
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelCertChangeE.java
View File

@ -90,6 +90,10 @@ public class QualFilingPersonnelCertChangeE extends BaseE {
* 备案安全评价业务范围
*/
private String businessScope;
/**
* 专业能力编码
*/
private String professionalCapabilityCode;
/**
* 环境
*/

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

@ -63,6 +63,9 @@ public class OrgPersonnelCertEntity {
/** 备案安全评价业务范围 */
private String businessScope;
/** 专业能力编码 */
private String professionalCapabilityCode;
/** 租户ID */
private Long tenantId;
}

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

@ -67,6 +67,9 @@ public class QualFilingPersonnelCertEntity {
/** 备案安全评价业务范围 */
private String businessScope;
/** 专业能力编码 */
private String professionalCapabilityCode;
/** 租户ID */
private Long tenantId;

1
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelCertDO.java
View File

@ -32,6 +32,7 @@ public class OrgPersonnelCertDO {
private LocalDate reviewDate;
private String certAttachmentUrl;
private String businessScope;
private String professionalCapabilityCode;
// ---- GBS默认字段 ----
private String deleteEnum;

1
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelCertDO.java
View File

@ -33,6 +33,7 @@ public class QualFilingPersonnelCertDO {
private String certAttachmentUrl;
private Long sourceCertId;
private String businessScope;
private String professionalCapabilityCode;
// ---- GBS默认字段 ----
private String deleteEnum;

4
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelCertChangeDO.java
View File

@ -98,6 +98,10 @@ public class QualFilingPersonnelCertChangeDO extends BaseDO {
* 备案安全评价业务范围
*/
private String businessScope;
/**
* 专业能力编码
*/
private String professionalCapabilityCode;
/**
* 环境
*/

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

@ -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())

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

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

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

@ -24,6 +24,7 @@
<result property="certAttachmentUrl" column="cert_attachment_url"/>
<result property="sourceCertId" column="source_cert_id"/>
<result property="businessScope" column="business_scope"/>
<result property="professionalCapabilityCode" column="professional_capability_code"/>
<result property="deleteEnum" column="delete_enum"/>
<result property="remarks" column="remarks"/>
<result property="createName" column="create_name"/>
@ -57,6 +58,7 @@
cert_attachment_url,
source_cert_id,
business_scope,
professional_capability_code,
delete_enum,
remarks,
create_name,

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

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