From d61fe350aa3ce33df88ac3aa09a45e10253aa2ea Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 31 Jul 2026 16:25:39 +0800 Subject: [PATCH] fix bug --- .../executor/QualFilingPersonnelExecutor.java | 9 +++------ .../orchestrator/QualFilingOrchestrator.java | 3 +-- .../support/QualFilingOrgPersonnelImporter.java | 7 +++---- .../QualFilingPersonnelChangeAddCmd.java | 13 +++---------- .../QualFilingPersonnelChangePageQry.java | 11 +++-------- .../QualFilingPersonnelChangeUpdateCmd.java | 11 +++-------- .../response/QualFilingPersonnelChangeCo.java | 11 +++-------- .../safetyeval/client/co/OrgPersonnelCO.java | 13 ++----------- .../client/co/QualFilingPersonnelCO.java | 7 ++----- .../client/dto/OrgPersonnelAddCmd.java | 17 ++--------------- .../client/dto/OrgPersonnelModifyCmd.java | 17 ++--------------- .../client/dto/QualFilingPersonnelAddCmd.java | 7 ++----- .../dto/QualFilingPersonnelModifyCmd.java | 7 ++----- .../model/QualFilingPersonnelChangeE.java | 8 ++------ .../domain/entity/OrgPersonnelEntity.java | 13 ++----------- .../entity/QualFilingPersonnelEntity.java | 7 ++----- .../dataobject/OrgPersonnelDO.java | 5 +---- .../dataobject/QualFilingPersonnelDO.java | 3 +-- .../QualFilingPersonnelGatewayImpl.java | 6 ++---- .../QualFilingPersonnelChangeDO.java | 8 ++------ ...QualFilingPersonnelChangeRepositoryImpl.java | 7 ++----- .../support/OrgPersonnelRawRepository.java | 16 +++++----------- .../utils/ComplianceCheckUtil.java | 2 +- .../mapper/QualFilingPersonnelChangeMapper.xml | 6 ++---- .../mapper/QualFilingPersonnelMapper.xml | 5 ++--- 25 files changed, 55 insertions(+), 164 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelExecutor.java index 6e758e2..f5ad6cc 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingPersonnelExecutor.java @@ -33,9 +33,8 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi { QualFilingPersonnelEntity entity = new QualFilingPersonnelEntity(); entity.setPersonName(cmd.getPersonName()); entity.setPersonTypeCode(cmd.getPersonTypeCode()); - entity.setPersonTypeName(cmd.getPersonTypeName()); entity.setPositionName(cmd.getPositionName()); - entity.setTitleCode(cmd.getTitleCode()); + entity.setTitleCodeArr(cmd.getTitleCodeArr()); entity.setGenderCode(cmd.getGenderCode()); entity.setGenderName(cmd.getGenderName()); entity.setBirthDate(cmd.getBirthDate()); @@ -71,9 +70,8 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi { entity.setId(cmd.getId()); entity.setPersonName(cmd.getPersonName()); entity.setPersonTypeCode(cmd.getPersonTypeCode()); - entity.setPersonTypeName(cmd.getPersonTypeName()); entity.setPositionName(cmd.getPositionName()); - entity.setTitleCode(cmd.getTitleCode()); + entity.setTitleCodeArr(cmd.getTitleCodeArr()); entity.setGenderCode(cmd.getGenderCode()); entity.setGenderName(cmd.getGenderName()); entity.setBirthDate(cmd.getBirthDate()); @@ -140,9 +138,8 @@ public class QualFilingPersonnelExecutor implements QualFilingPersonnelApi { co.setSourcePersonnelId(entity.getSourcePersonnelId()); co.setPersonName(entity.getPersonName()); co.setPersonTypeCode(entity.getPersonTypeCode()); - co.setPersonTypeName(entity.getPersonTypeName()); co.setPositionName(entity.getPositionName()); - co.setTitleCode(entity.getTitleCode()); + co.setTitleCodeArr(entity.getTitleCodeArr()); co.setGenderCode(entity.getGenderCode()); co.setGenderName(entity.getGenderName()); co.setBirthDate(entity.getBirthDate()); diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index 29c62fd..d4daf07 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java @@ -780,9 +780,8 @@ public class QualFilingOrchestrator { co.setSourcePersonnelId(entity.getSourcePersonnelId()); co.setPersonName(entity.getPersonName()); co.setPersonTypeCode(entity.getPersonTypeCode()); - co.setPersonTypeName(entity.getPersonTypeName()); co.setPositionName(entity.getPositionName()); - co.setTitleCode(entity.getTitleCode()); + co.setTitleCodeArr(entity.getTitleCodeArr()); co.setGenderCode(entity.getGenderCode()); co.setGenderName(entity.getGenderName()); co.setBirthDate(entity.getBirthDate()); 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 c539965..98023c7 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 @@ -72,8 +72,7 @@ public class QualFilingOrgPersonnelImporter { entity.setSourcePersonnelId(source.getId()); entity.setPersonName(source.getUserName()); entity.setPersonTypeCode(source.getPersonTypeCode()); - entity.setPersonTypeName(source.getPersonTypeName()); - entity.setTitleCode(source.getTitleCode()); + entity.setTitleCodeArr(source.getTitleCodeArr()); entity.setGenderCode(source.getGenderCode()); entity.setGenderName(source.getGenderName()); entity.setBirthDate(source.getBirthDate()); @@ -86,8 +85,8 @@ public class QualFilingOrgPersonnelImporter { entity.setMajor(source.getMajor()); entity.setQualScope(source.getQualScope()); entity.setPublications(source.getPublications()); - if (StringUtils.hasText(source.getProfessionalLevelName()) || StringUtils.hasText(source.getEvaluatorCertNo())) { - entity.setProfessionalLevelCert(source.getProfessionalLevelName() + "/" + source.getEvaluatorCertNo()); + if (StringUtils.hasText(source.getEvaluatorCertNo())) { + entity.setProfessionalLevelCert(source.getEvaluatorCertNo()); } entity.setRegisterEngineerFlag(source.getRegisterEngineerFlag()); entity.setAbilityDeclaration(source.getAbilityDeclaration()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java index 66e2a2e..e70494c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeAddCmd.java @@ -46,12 +46,6 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable { @ApiModelProperty(value = "人员类型编码") @Size(max = 64, message = "人员类型编码不能超过64个字符") private String personTypeCode; - /** - * 人员类型名称 - */ - @ApiModelProperty(value = "人员类型名称") - @Size(max = 128, message = "人员类型名称不能超过128个字符") - private String personTypeName; /** * 职务 */ @@ -59,11 +53,10 @@ public class QualFilingPersonnelChangeAddCmd implements Serializable { @Size(max = 128, message = "职务不能超过128个字符") private String positionName; /** - * 职称 + * 职称(多个逗号分隔) */ - @ApiModelProperty(value = "职称") - @Size(max = 128, message = "职称不能超过128个字符") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; /** * 性别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java index 87d04de..ab4662b 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangePageQry.java @@ -36,21 +36,16 @@ public class QualFilingPersonnelChangePageQry extends PageQuery { */ @ApiModelProperty(value = "人员类型编码") private String personTypeCode; - /** - * 人员类型名称 - */ - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; /** * 职务 */ @ApiModelProperty(value = "职务") private String positionName; /** - * 职称 + * 职称(多个逗号分隔) */ - @ApiModelProperty(value = "职称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; /** * 性别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java index 6a9c774..19f6748 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/request/QualFilingPersonnelChangeUpdateCmd.java @@ -44,21 +44,16 @@ public class QualFilingPersonnelChangeUpdateCmd implements Serializable { */ @ApiModelProperty(value = "人员类型编码") private String personTypeCode; - /** - * 人员类型名称 - */ - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; /** * 职务 */ @ApiModelProperty(value = "职务") private String positionName; /** - * 职称 + * 职称(多个逗号分隔) */ - @ApiModelProperty(value = "职称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; /** * 性别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java index 969aca8..42040f0 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/change/response/QualFilingPersonnelChangeCo.java @@ -38,21 +38,16 @@ public class QualFilingPersonnelChangeCo extends ClientObject { */ @ApiModelProperty(value = "人员类型编码") private String personTypeCode; - /** - * 人员类型名称 - */ - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; /** * 职务 */ @ApiModelProperty(value = "职务") private String positionName; /** - * 职称 + * 职称(多个逗号分隔) */ - @ApiModelProperty(value = "职称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; /** * 性别编码 */ diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java index a549bf6..896b559 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgPersonnelCO.java @@ -72,18 +72,9 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; - @ApiModelProperty(value = "资质范围") private String qualScope; - @ApiModelProperty(value = "职业资格等级编码") - private String professionalLevelCode; - - @ApiModelProperty(value = "职业资格等级名称") - private String professionalLevelName; - @ApiModelProperty(value = "评价师证书编号") private String evaluatorCertNo; @@ -99,8 +90,8 @@ public class OrgPersonnelCO { @ApiModelProperty(value = "教育水平名称") private String educationLevelName; - @ApiModelProperty(value = "职称名称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java index 1e3b6a2..5d0b50f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelCO.java @@ -28,14 +28,11 @@ public class QualFilingPersonnelCO { @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; - @ApiModelProperty(value = "职位名称") private String positionName; - @ApiModelProperty(value = "职称名称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java index 4206978..71e11b7 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelAddCmd.java @@ -79,22 +79,10 @@ public class OrgPersonnelAddCmd { @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - @Size(max = 50, message = "人员类型名称长度不能超过50个字符") - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; - @Size(max = 500, message = "资质范围长度不能超过500个字符") @ApiModelProperty(value = "资质范围") private String qualScope; - @Size(max = 32, message = "职业等级编码长度不能超过32个字符") - @ApiModelProperty(value = "职业等级编码") - private String professionalLevelCode; - - @Size(max = 200, message = "职业等级名称长度不能超过200个字符") - @ApiModelProperty(value = "职业等级名称") - private String professionalLevelName; - @Size(max = 100, message = "证书编号长度不能超过100个字符") @ApiModelProperty(value = "安全评价师证书编号") private String evaluatorCertNo; @@ -115,9 +103,8 @@ public class OrgPersonnelAddCmd { @ApiModelProperty(value = "学历层次名称") private String educationLevelName; - @Size(max = 50, message = "职称长度不能超过50个字符") - @ApiModelProperty(value = "职称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java index 698fabc..071cf07 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgPersonnelModifyCmd.java @@ -82,22 +82,10 @@ public class OrgPersonnelModifyCmd { @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - @Size(max = 50, message = "人员类型名称长度不能超过50个字符") - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; - @Size(max = 500, message = "资质范围长度不能超过500个字符") @ApiModelProperty(value = "资质范围") private String qualScope; - @Size(max = 32, message = "职业等级编码长度不能超过32个字符") - @ApiModelProperty(value = "职业等级编码") - private String professionalLevelCode; - - @Size(max = 200, message = "职业等级名称长度不能超过200个字符") - @ApiModelProperty(value = "职业等级名称") - private String professionalLevelName; - @Size(max = 100, message = "证书编号长度不能超过100个字符") @ApiModelProperty(value = "安全评价师证书编号") private String evaluatorCertNo; @@ -118,9 +106,8 @@ public class OrgPersonnelModifyCmd { @ApiModelProperty(value = "学历层次名称") private String educationLevelName; - @Size(max = 50, message = "职称长度不能超过50个字符") - @ApiModelProperty(value = "职称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; @ApiModelProperty(value = "是否注册安全工程师(1是2否)") private Integer registerEngineerFlag; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java index d513dee..ff40194 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelAddCmd.java @@ -18,14 +18,11 @@ public class QualFilingPersonnelAddCmd { @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; - @ApiModelProperty(value = "职务") private String positionName; - @ApiModelProperty(value = "职称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java index 2187a41..e8c7356 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/QualFilingPersonnelModifyCmd.java @@ -21,14 +21,11 @@ public class QualFilingPersonnelModifyCmd { @ApiModelProperty(value = "人员类型编码(1基础人员2专职评价师)") private String personTypeCode; - @ApiModelProperty(value = "人员类型名称") - private String personTypeName; - @ApiModelProperty(value = "职务") private String positionName; - @ApiModelProperty(value = "职称") - private String titleCode; + @ApiModelProperty(value = "职称(多个逗号分隔)") + private String titleCodeArr; @ApiModelProperty(value = "性别编码(1男2女)") private Integer genderCode; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java index a1e1be7..a4d34f2 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/change/model/QualFilingPersonnelChangeE.java @@ -38,18 +38,14 @@ public class QualFilingPersonnelChangeE extends BaseE { * 人员类型编码 */ private String personTypeCode; - /** - * 人员类型名称 - */ - private String personTypeName; /** * 职务 */ private String positionName; /** - * 职称 + * 职称(多个逗号分隔) */ - private String titleCode; + private String titleCodeArr; /** * 性别编码 */ diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java index 23b722c..b2a62d5 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/OrgPersonnelEntity.java @@ -75,18 +75,9 @@ public class OrgPersonnelEntity { /** 人员类型编码 */ private String personTypeCode; - /** 人员类型名称 */ - private String personTypeName; - /** 资质范围 */ private String qualScope; - /** 职业等级编码 */ - private String professionalLevelCode; - - /** 职业等级名称 */ - private String professionalLevelName; - /** 安全评价师证书编号 */ private String evaluatorCertNo; @@ -102,8 +93,8 @@ public class OrgPersonnelEntity { /** 学历层次名称 */ private String educationLevelName; - /** 职称 */ - private String titleCode; + /** 职称(多个逗号分隔) */ + private String titleCodeArr; /** 是否注册安全工程师(1是2否) */ private Integer registerEngineerFlag; diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java index e465749..045356d 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/QualFilingPersonnelEntity.java @@ -28,14 +28,11 @@ public class QualFilingPersonnelEntity { /** 人员类型编码 */ private String personTypeCode; - /** 人员类型名称 */ - private String personTypeName; - /** 职务 */ private String positionName; - /** 职称 */ - private String titleCode; + /** 职称(多个逗号分隔) */ + private String titleCodeArr; /** 性别编码 */ private Integer genderCode; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java index 77353c3..ea2b83c 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/OrgPersonnelDO.java @@ -39,16 +39,13 @@ public class OrgPersonnelDO { private Integer employmentStatusCode; private String employmentStatusName; private String personTypeCode; - private String personTypeName; private String qualScope; - private String professionalLevelCode; - private String professionalLevelName; private String evaluatorCertNo; private String educationTypeCode; private String educationTypeName; private String educationLevelCode; private String educationLevelName; - private String titleCode; + private String titleCodeArr; private Integer registerEngineerFlag; private String publications; private String abilityDeclaration; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelDO.java index 45505da..692e6fe 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/QualFilingPersonnelDO.java @@ -20,9 +20,8 @@ public class QualFilingPersonnelDO { private Long sourcePersonnelId; private String personName; private String personTypeCode; - private String personTypeName; private String positionName; - private String titleCode; + private String titleCodeArr; private Integer genderCode; private String genderName; private LocalDate birthDate; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelGatewayImpl.java index 68b6a3d..055999d 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingPersonnelGatewayImpl.java @@ -119,9 +119,8 @@ public class QualFilingPersonnelGatewayImpl implements QualFilingPersonnelGatewa dataObject.setSourcePersonnelId(entity.getSourcePersonnelId()); dataObject.setPersonName(entity.getPersonName()); dataObject.setPersonTypeCode(entity.getPersonTypeCode()); - dataObject.setPersonTypeName(entity.getPersonTypeName()); dataObject.setPositionName(entity.getPositionName()); - dataObject.setTitleCode(entity.getTitleCode()); + dataObject.setTitleCodeArr(entity.getTitleCodeArr()); dataObject.setGenderCode(entity.getGenderCode()); dataObject.setGenderName(entity.getGenderName()); dataObject.setBirthDate(entity.getBirthDate()); @@ -154,9 +153,8 @@ public class QualFilingPersonnelGatewayImpl implements QualFilingPersonnelGatewa entity.setSourcePersonnelId(dataObject.getSourcePersonnelId()); entity.setPersonName(dataObject.getPersonName()); entity.setPersonTypeCode(dataObject.getPersonTypeCode()); - entity.setPersonTypeName(dataObject.getPersonTypeName()); entity.setPositionName(dataObject.getPositionName()); - entity.setTitleCode(dataObject.getTitleCode()); + entity.setTitleCodeArr(dataObject.getTitleCodeArr()); entity.setGenderCode(dataObject.getGenderCode()); entity.setGenderName(dataObject.getGenderName()); entity.setBirthDate(dataObject.getBirthDate()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java index b3f3b17..e346139 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/QualFilingPersonnelChangeDO.java @@ -43,18 +43,14 @@ public class QualFilingPersonnelChangeDO extends BaseDO { * 人员类型编码 */ private String personTypeCode; - /** - * 人员类型名称 - */ - private String personTypeName; /** * 职务 */ private String positionName; /** - * 职称 + * 职称(多个逗号分隔) */ - private String titleCode; + private String titleCodeArr; /** * 性别编码 */ diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java index ce03618..b15eb11 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/QualFilingPersonnelChangeRepositoryImpl.java @@ -47,14 +47,11 @@ public class QualFilingPersonnelChangeRepositoryImpl extends BaseRepositoryImpl< if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getPersonTypeCode())) { qualFilingPersonnelChangeDoQueryWrapper.eq("person_type_code", qualFilingPersonnelChangePageQry.getPersonTypeCode()); } - if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getPersonTypeName())) { - qualFilingPersonnelChangeDoQueryWrapper.like("person_type_name", qualFilingPersonnelChangePageQry.getPersonTypeName()); - } if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getPositionName())) { qualFilingPersonnelChangeDoQueryWrapper.like("position_name", qualFilingPersonnelChangePageQry.getPositionName()); } - if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getTitleCode())) { - qualFilingPersonnelChangeDoQueryWrapper.like("title_code", qualFilingPersonnelChangePageQry.getTitleCode()); + if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getTitleCodeArr())) { + qualFilingPersonnelChangeDoQueryWrapper.like("title_code_arr", qualFilingPersonnelChangePageQry.getTitleCodeArr()); } if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getGenderCode())) { qualFilingPersonnelChangeDoQueryWrapper.eq("gender_code", qualFilingPersonnelChangePageQry.getGenderCode()); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/OrgPersonnelRawRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/OrgPersonnelRawRepository.java index 636a162..6b79c7d 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/OrgPersonnelRawRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/OrgPersonnelRawRepository.java @@ -31,10 +31,10 @@ public class OrgPersonnelRawRepository { + "gender_code = ?, gender_name = ?, birth_date = ?, id_card_no = ?, " + "current_address = ?, office_address = ?, education_code = ?, education_name = ?, " + "graduate_school = ?, major = ?, employment_status_code = ?, employment_status_name = ?, " - + "person_type_code = ?, person_type_name = ?, qual_scope = ?, " - + "professional_level_code = ?, professional_level_name = ?, evaluator_cert_no = ?, " + + "person_type_code = ?, qual_scope = ?, " + + "evaluator_cert_no = ?, " + "education_type_code = ?, education_type_name = ?, education_level_code = ?, education_level_name = ?, " - + "title_code = ?, register_engineer_flag = ?, publications = ?, ability_declaration = ?, " + + "title_code_arr = ?, register_engineer_flag = ?, publications = ?, ability_declaration = ?, " + "work_experience = ?, proof_material_url = ?, delete_enum = 'false', " + "update_time = ?, update_id = ?, update_name = ? " + "WHERE id = ?"; @@ -57,16 +57,13 @@ public class OrgPersonnelRawRepository { dataObject.getEmploymentStatusCode(), dataObject.getEmploymentStatusName(), dataObject.getPersonTypeCode(), - dataObject.getPersonTypeName(), dataObject.getQualScope(), - dataObject.getProfessionalLevelCode(), - dataObject.getProfessionalLevelName(), dataObject.getEvaluatorCertNo(), dataObject.getEducationTypeCode(), dataObject.getEducationTypeName(), dataObject.getEducationLevelCode(), dataObject.getEducationLevelName(), - dataObject.getTitleCode(), + dataObject.getTitleCodeArr(), dataObject.getRegisterEngineerFlag(), dataObject.getPublications(), dataObject.getAbilityDeclaration(), @@ -114,16 +111,13 @@ public class OrgPersonnelRawRepository { } row.setEmploymentStatusName(rs.getString("employment_status_name")); row.setPersonTypeCode(rs.getString("person_type_code")); - row.setPersonTypeName(rs.getString("person_type_name")); row.setQualScope(rs.getString("qual_scope")); - row.setProfessionalLevelCode(rs.getString("professional_level_code")); - row.setProfessionalLevelName(rs.getString("professional_level_name")); row.setEvaluatorCertNo(rs.getString("evaluator_cert_no")); row.setEducationTypeCode(rs.getString("education_type_code")); row.setEducationTypeName(rs.getString("education_type_name")); row.setEducationLevelCode(rs.getString("education_level_code")); row.setEducationLevelName(rs.getString("education_level_name")); - row.setTitleCode(rs.getString("title_code")); + row.setTitleCodeArr(rs.getString("title_code_arr")); int registerEngineerFlag = rs.getInt("register_engineer_flag"); if (!rs.wasNull()) { row.setRegisterEngineerFlag(registerEngineerFlag); 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 00317da..e523531 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 @@ -179,7 +179,7 @@ public class ComplianceCheckUtil { .filter(p -> p.getRegisterEngineerFlag() != null && p.getRegisterEngineerFlag() == 1) .count(); long seniorTitleCount = personnelList.stream() - .filter(p -> QualificationLevelEnum.SENIOR.getCode().equals(p.getTitleCode())) + .filter(p -> QualificationLevelEnum.SENIOR.getCode().equals(p.getTitleCodeArr())) .count(); long engineerRate = engineerCount * 100 / total; long seniorTitleRate = seniorTitleCount * 100 / total; diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml index 2d2b0fe..7a6ce4d 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml @@ -11,9 +11,8 @@ - - + @@ -52,9 +51,8 @@ source_personnel_id, person_name, person_type_code, - person_type_name, position_name, - title_code, + title_code_arr, gender_code, gender_name, birth_date, diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml index d573364..0a1528e 100644 --- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml +++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml @@ -9,9 +9,8 @@ - - + @@ -46,7 +45,7 @@ - `id`, `filing_id`, `source_personnel_id`, `person_name`, `person_type_code`, `person_type_name`, `position_name`, `title_code`, `gender_code`, `gender_name`, `birth_date`, `join_work_date`, `id_card_no`, `current_address`, `office_address`, `education_code`, `education_name`, `graduate_school`, `major`, `qual_scope`, `publications`, `professional_level_cert`, `register_engineer_flag`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env` + `id`, `filing_id`, `source_personnel_id`, `person_name`, `person_type_code`, `position_name`, `title_code_arr`, `gender_code`, `gender_name`, `birth_date`, `join_work_date`, `id_card_no`, `current_address`, `office_address`, `education_code`, `education_name`, `graduate_school`, `major`, `qual_scope`, `publications`, `professional_level_cert`, `register_engineer_flag`, `ability_declaration`, `work_experience`, `proof_material_url`, `delete_enum`, `remarks`, `create_name`, `update_name`, `tenant_id`, `org_id`, `version`, `create_time`, `update_time`, `create_id`, `update_id`, `env`