From 127270cc789630de666a000bc21abbe14315b175 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 18 Aug 2026 17:29:16 +0800 Subject: [PATCH] fix: bug --- .../executor/QualFilingPersonnelCertExecutor.java | 6 ++++++ .../app/support/QualFilingOrgPersonnelImporter.java | 2 ++ .../request/QualFilingPersonnelCertChangeAddCmd.java | 12 ++++++++++++ .../QualFilingPersonnelCertChangeUpdateCmd.java | 10 ++++++++++ .../response/QualFilingPersonnelCertChangeCo.java | 10 ++++++++++ .../safetyeval/client/co/OrgPersonnelCertCO.java | 6 ++++++ .../client/co/PersonnelCertFilingPageCO.java | 10 ++++++++++ .../client/co/QualFilingPersonnelCertCO.java | 6 ++++++ .../client/dto/OrgPersonnelCertAddCmd.java | 8 ++++++++ .../client/dto/OrgPersonnelCertModifyCmd.java | 8 ++++++++ .../client/dto/QualFilingPersonnelCertAddCmd.java | 6 ++++++ .../client/dto/QualFilingPersonnelCertModifyCmd.java | 6 ++++++ .../change/model/QualFilingPersonnelCertChangeE.java | 8 ++++++++ .../domain/entity/OrgPersonnelCertEntity.java | 6 ++++++ .../domain/entity/QualFilingPersonnelCertEntity.java | 6 ++++++ .../dataobject/OrgPersonnelCertDO.java | 2 ++ .../dataobject/QualFilingPersonnelCertDO.java | 2 ++ .../QualFilingPersonnelCertGatewayImpl.java | 4 ++++ .../QualFilingPersonnelCertChangeDO.java | 8 ++++++++ .../main/resources/mapper/OrgPersonnelCertMapper.xml | 6 +++++- .../mapper/QualFilingPersonnelCertChangeMapper.xml | 4 ++++ .../mapper/QualFilingPersonnelCertMapper.xml | 8 ++++++-- 22 files changed, 141 insertions(+), 3 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java index 6a77c801..453d1c83 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelCertExecutor.java @@ -44,6 +44,8 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA entity.setValidEndDate(cmd.getValidEndDate()); entity.setReviewDate(cmd.getReviewDate()); entity.setCertAttachmentUrl(cmd.getCertAttachmentUrl()); + entity.setPractisingCertUrl(cmd.getPractisingCertUrl()); + entity.setPractisingCertCode(cmd.getPractisingCertCode()); QualFilingPersonnelCertEntity result = qualFilingPersonnelCertDomainService.add(entity); return SingleResponse.success(toCO(result)); @@ -72,6 +74,8 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA entity.setValidEndDate(cmd.getValidEndDate()); entity.setReviewDate(cmd.getReviewDate()); entity.setCertAttachmentUrl(cmd.getCertAttachmentUrl()); + entity.setPractisingCertUrl(cmd.getPractisingCertUrl()); + entity.setPractisingCertCode(cmd.getPractisingCertCode()); QualFilingPersonnelCertEntity result = qualFilingPersonnelCertDomainService.modify(entity); return SingleResponse.success(toCO(result)); @@ -123,6 +127,8 @@ public class QualFilingPersonnelCertExecutor implements QualFilingPersonnelCertA co.setValidEndDate(entity.getValidEndDate()); co.setReviewDate(entity.getReviewDate()); co.setCertAttachmentUrl(entity.getCertAttachmentUrl()); + co.setPractisingCertUrl(entity.getPractisingCertUrl()); + co.setPractisingCertCode(entity.getPractisingCertCode()); co.setBusinessScope(entity.getBusinessScope()); co.setTenantId(entity.getTenantId()); return co; diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java index 98023c76..26ea150d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/QualFilingOrgPersonnelImporter.java @@ -113,6 +113,8 @@ public class QualFilingOrgPersonnelImporter { entity.setValidEndDate(source.getValidEndDate()); entity.setReviewDate(source.getReviewDate()); entity.setCertAttachmentUrl(source.getCertAttachmentUrl()); + entity.setPractisingCertUrl(source.getPractisingCertUrl()); + entity.setPractisingCertCode(source.getPractisingCertCode()); entity.setBusinessScope(source.getBusinessScope()); return entity; } 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 ac9b6b4f..3155b8a4 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 @@ -103,6 +103,18 @@ public class QualFilingPersonnelCertChangeAddCmd implements Serializable { @ApiModelProperty(value = "证书附件地址") @Size(max = 512, message = "证书附件地址不能超过512个字符") private String certAttachmentUrl; + /** + * 执业证书地址 + */ + @ApiModelProperty(value = "执业证书地址") + @Size(max = 500, message = "执业证书地址不能超过500个字符") + private String practisingCertUrl; + /** + * 执业证书编号 + */ + @ApiModelProperty(value = "执业证书编号") + @Size(max = 200, message = "执业证书编号不能超过200个字符") + private String practisingCertCode; /** * 来源人员证书id */ 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 f989176d..0b05a836 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 @@ -96,6 +96,16 @@ public class QualFilingPersonnelCertChangeUpdateCmd implements Serializable { */ @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; + /** + * 执业证书地址 + */ + @ApiModelProperty(value = "执业证书地址") + private String practisingCertUrl; + /** + * 执业证书编号 + */ + @ApiModelProperty(value = "执业证书编号") + private String practisingCertCode; /** * 来源人员证书id */ 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 f41740a1..a2964d23 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 @@ -96,6 +96,16 @@ public class QualFilingPersonnelCertChangeCo extends ClientObject { */ @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; + /** + * 执业证书地址 + */ + @ApiModelProperty(value = "执业证书地址") + private String practisingCertUrl; + /** + * 执业证书编号 + */ + @ApiModelProperty(value = "执业证书编号") + private String practisingCertCode; /** * 来源人员证书id */ 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 74df0cee..b352e22c 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 @@ -57,6 +57,12 @@ public class OrgPersonnelCertCO { @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; + @ApiModelProperty(value = "执业证书地址") + private String practisingCertUrl; + + @ApiModelProperty(value = "执业证书编号") + private String practisingCertCode; + @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/PersonnelCertFilingPageCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/PersonnelCertFilingPageCO.java index 552ac866..84ea7dd8 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/PersonnelCertFilingPageCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/PersonnelCertFilingPageCO.java @@ -38,4 +38,14 @@ public class PersonnelCertFilingPageCO { * 证书编号 */ private String certNo; + + /** + * 执业证书地址 + */ + private String practisingCertUrl; + + /** + * 执业证书编号 + */ + private String practisingCertCode; } 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 722a0057..1691b049 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 @@ -64,6 +64,12 @@ public class QualFilingPersonnelCertCO { @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; + @ApiModelProperty(value = "执业证书地址") + private String practisingCertUrl; + + @ApiModelProperty(value = "执业证书编号") + private String practisingCertCode; + @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; 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 00bf099f..15a2865a 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 @@ -62,6 +62,14 @@ public class OrgPersonnelCertAddCmd { @Size(max = 500, message = "证书附件地址不能超过500个字符") private String certAttachmentUrl; + @ApiModelProperty(value = "执业证书地址") + @Size(max = 500, message = "执业证书地址不能超过500个字符") + private String practisingCertUrl; + + @ApiModelProperty(value = "执业证书编号") + @Size(max = 200, message = "执业证书编号不能超过200个字符") + private String practisingCertCode; + @ApiModelProperty(value = "备案安全评价业务范围") @Size(max = 500, message = "备案安全评价业务范围不能超过500个字符") private String businessScope; 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 9f300db0..54c2dcc5 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 @@ -65,6 +65,14 @@ public class OrgPersonnelCertModifyCmd { @Size(max = 500, message = "证书附件地址不能超过500个字符") private String certAttachmentUrl; + @ApiModelProperty(value = "执业证书地址") + @Size(max = 500, message = "执业证书地址不能超过500个字符") + private String practisingCertUrl; + + @ApiModelProperty(value = "执业证书编号") + @Size(max = 200, message = "执业证书编号不能超过200个字符") + private String practisingCertCode; + @ApiModelProperty(value = "备案安全评价业务范围") @Size(max = 500, message = "备案安全评价业务范围不能超过500个字符") private String businessScope; 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 abe6e23a..1bb1d5f8 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 @@ -51,6 +51,12 @@ public class QualFilingPersonnelCertAddCmd { @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; + @ApiModelProperty(value = "执业证书地址") + private String practisingCertUrl; + + @ApiModelProperty(value = "执业证书编号") + private String practisingCertCode; + @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; 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 d315b4bc..7f8fcdc6 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 @@ -54,6 +54,12 @@ public class QualFilingPersonnelCertModifyCmd { @ApiModelProperty(value = "证书附件地址") private String certAttachmentUrl; + @ApiModelProperty(value = "执业证书地址") + private String practisingCertUrl; + + @ApiModelProperty(value = "执业证书编号") + private String practisingCertCode; + @ApiModelProperty(value = "备案安全评价业务范围") private String businessScope; 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 ac16d1ba..ccc3b6ff 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 @@ -82,6 +82,14 @@ public class QualFilingPersonnelCertChangeE extends BaseE { * 证书附件地址 */ private String certAttachmentUrl; + /** + * 执业证书地址 + */ + private String practisingCertUrl; + /** + * 执业证书编号 + */ + private String practisingCertCode; /** * 来源人员证书id */ 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 d4f2556b..54903929 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 @@ -60,6 +60,12 @@ public class OrgPersonnelCertEntity { /** 证书附件地址 */ private String certAttachmentUrl; + /** 执业证书地址 */ + private String practisingCertUrl; + + /** 执业证书编号 */ + private String practisingCertCode; + /** 备案安全评价业务范围 */ private String businessScope; 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 b53dba89..75e612ff 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 @@ -61,6 +61,12 @@ public class QualFilingPersonnelCertEntity { /** 证书附件地址 */ private String certAttachmentUrl; + /** 执业证书地址 */ + private String practisingCertUrl; + + /** 执业证书编号 */ + private String practisingCertCode; + /** 来源人员证书ID */ private Long sourceCertId; 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 4c3edf19..b8a45c70 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 @@ -31,6 +31,8 @@ public class OrgPersonnelCertDO { private LocalDate validEndDate; private LocalDate reviewDate; private String certAttachmentUrl; + private String practisingCertUrl; + private String practisingCertCode; private String businessScope; private String professionalCapabilityCode; private Long industryProfessionalStandardsId; 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 24bd0df2..2f7c4394 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 @@ -31,6 +31,8 @@ public class QualFilingPersonnelCertDO { private LocalDate validEndDate; private LocalDate reviewDate; private String certAttachmentUrl; + private String practisingCertUrl; + private String practisingCertCode; private Long sourceCertId; private String businessScope; private String professionalCapabilityCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java index d0c39bc1..4141da65 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelCertGatewayImpl.java @@ -115,6 +115,8 @@ public class QualFilingPersonnelCertGatewayImpl implements QualFilingPersonnelCe dataObject.setValidEndDate(entity.getValidEndDate()); dataObject.setReviewDate(entity.getReviewDate()); dataObject.setCertAttachmentUrl(entity.getCertAttachmentUrl()); + dataObject.setPractisingCertUrl(entity.getPractisingCertUrl()); + dataObject.setPractisingCertCode(entity.getPractisingCertCode()); dataObject.setSourceCertId(entity.getSourceCertId()); dataObject.setTenantId(entity.getTenantId()); return dataObject; @@ -141,6 +143,8 @@ public class QualFilingPersonnelCertGatewayImpl implements QualFilingPersonnelCe entity.setValidEndDate(dataObject.getValidEndDate()); entity.setReviewDate(dataObject.getReviewDate()); entity.setCertAttachmentUrl(dataObject.getCertAttachmentUrl()); + entity.setPractisingCertUrl(dataObject.getPractisingCertUrl()); + entity.setPractisingCertCode(dataObject.getPractisingCertCode()); entity.setSourceCertId(dataObject.getSourceCertId()); entity.setBusinessScope(dataObject.getBusinessScope()); entity.setTenantId(dataObject.getTenantId()); 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 f0ff8661..57530d73 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 @@ -90,6 +90,14 @@ public class QualFilingPersonnelCertChangeDO extends BaseDO { * 证书附件地址 */ private String certAttachmentUrl; + /** + * 执业证书地址 + */ + private String practisingCertUrl; + /** + * 执业证书编号 + */ + private String practisingCertCode; /** * 来源人员证书id */ diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml index 0281429f..3a2bfd16 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelCertMapper.xml @@ -20,6 +20,8 @@ + + @@ -38,7 +40,7 @@ - `id`, `org_id`, `personnel_id`, `cert_name`, `cert_type_code`, `cert_level`, `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` + `id`, `org_id`, `personnel_id`, `cert_name`, `cert_type_code`, `cert_level`, `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`, `practising_cert_url`, `practising_cert_code`, `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` @@ -94,6 +96,8 @@ opc.valid_end_date, opc.review_date, opc.cert_attachment_url, + opc.practising_cert_url, + opc.practising_cert_code, opc.business_scope, opc.professional_capability_code, opc.industry_professional_standards_id, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml index 1421115b..f8b045b4 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertChangeMapper.xml @@ -22,6 +22,8 @@ + + @@ -56,6 +58,8 @@ valid_end_date, review_date, cert_attachment_url, + practising_cert_url, + practising_cert_code, source_cert_id, business_scope, professional_capability_code, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml index 234cfaec..cb873c7a 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelCertMapper.xml @@ -20,6 +20,8 @@ + + @@ -39,7 +41,7 @@ - `id`, `filing_id`, `filing_personnel_id`, `cert_name`, `cert_type_code`, `cert_level`, `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` + `id`, `filing_id`, `filing_personnel_id`, `cert_name`, `cert_type_code`, `cert_level`, `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`, `practising_cert_url`, `practising_cert_code`, `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` @@ -50,7 +52,9 @@ opc.professional_capability_code AS professionalCapabilityCode, opc.cert_type_code AS certTypeCode, cert_level AS certLevel, - cert_no AS certNo + cert_no AS certNo, + opc.practising_cert_url AS practisingCertUrl, + opc.practising_cert_code AS practisingCertCode FROM org_personnel_cert opc WHERE personnel_id IN