fix bug

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

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

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.setTitleCodeArr(source.getTitleCodeArr());
-        entity.setTitleCode(source.getTitleCode());
         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())) {
+        if (StringUtils.hasText(source.getEvaluatorCertNo())) {
-            entity.setProfessionalLevelCert(source.getProfessionalLevelName() + "/" + source.getEvaluatorCertNo());
+            entity.setProfessionalLevelCert(source.getEvaluatorCertNo());
         }
         entity.setRegisterEngineerFlag(source.getRegisterEngineerFlag());
         entity.setAbilityDeclaration(source.getAbilityDeclaration());

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 = "职称")
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
-    @Size(max = 128, message = "职称不能超过128个字符")
+    private String titleCodeArr;
-    private String titleCode;
     /**
      * 性别编码
      */

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 = "职称")
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCode;
+    private String titleCodeArr;
     /**
      * 性别编码
      */

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 = "职称")
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCode;
+    private String titleCodeArr;
     /**
      * 性别编码
      */

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 = "职称")
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCode;
+    private String titleCodeArr;
     /**
      * 性别编码
      */

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 = "职称名称")
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCode;
+    private String titleCodeArr;
 
     @ApiModelProperty(value = "是否注册安全工程师(1是2否)")
     private Integer registerEngineerFlag;

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 = "职称名称")
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCode;
+    private String titleCodeArr;
 
     @ApiModelProperty(value = "性别编码(1男2女)")
     private Integer genderCode;

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 = "职称(多个逗号分隔)")
-    @ApiModelProperty(value = "职称")
+    private String titleCodeArr;
-    private String titleCode;
 
     @ApiModelProperty(value = "是否注册安全工程师(1是2否)")
     private Integer registerEngineerFlag;

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 = "职称(多个逗号分隔)")
-    @ApiModelProperty(value = "职称")
+    private String titleCodeArr;
-    private String titleCode;
 
     @ApiModelProperty(value = "是否注册安全工程师(1是2否)")
     private Integer registerEngineerFlag;

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 = "职称")
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCode;
+    private String titleCodeArr;
 
     @ApiModelProperty(value = "性别编码(1男2女)")
     private Integer genderCode;

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 = "职称")
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
-    private String titleCode;
+    private String titleCodeArr;
 
     @ApiModelProperty(value = "性别编码(1男2女)")
     private Integer genderCode;

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;
     /**
      * 性别编码
      */

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;

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;

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;

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;

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

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;
     /**
      * 性别编码
      */

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())) {
+        if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getTitleCodeArr())) {
-            qualFilingPersonnelChangeDoQueryWrapper.like("title_code", qualFilingPersonnelChangePageQry.getTitleCode());
+            qualFilingPersonnelChangeDoQueryWrapper.like("title_code_arr", qualFilingPersonnelChangePageQry.getTitleCodeArr());
         }
         if (ObjectUtil.isNotEmpty(qualFilingPersonnelChangePageQry.getGenderCode())) {
             qualFilingPersonnelChangeDoQueryWrapper.eq("gender_code", qualFilingPersonnelChangePageQry.getGenderCode());

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 = ?, "
+                + "person_type_code = ?, qual_scope = ?, "
-                + "professional_level_code = ?, professional_level_name = ?, evaluator_cert_no = ?, "
+                + "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);

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;

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

@@ -11,9 +11,8 @@
         <result property="sourcePersonnelId" column="source_personnel_id"/>
         <result property="personName" column="person_name"/>
         <result property="personTypeCode" column="person_type_code"/>
-        <result property="personTypeName" column="person_type_name"/>
         <result property="positionName" column="position_name"/>
-        <result property="titleCode" column="title_code"/>
+        <result property="titleCodeArr" column="title_code_arr"/>
         <result property="genderCode" column="gender_code"/>
         <result property="genderName" column="gender_name"/>
         <result property="birthDate" column="birth_date"/>
@@ -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,

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

@@ -9,9 +9,8 @@
         <result column="source_personnel_id" property="sourcePersonnelId"/>
         <result column="person_name" property="personName"/>
         <result column="person_type_code" property="personTypeCode"/>
-        <result column="person_type_name" property="personTypeName"/>
         <result column="position_name" property="positionName"/>
-        <result column="title_code" property="titleCode"/>
+        <result column="title_code_arr" property="titleCodeArr"/>
         <result column="gender_code" property="genderCode"/>
         <result column="gender_name" property="genderName"/>
         <result column="birth_date" property="birthDate"/>
@@ -46,7 +45,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        `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`
     </sql>
 
 </mapper>