From 258d2e92a179c31b76415df7615c679074a212ca Mon Sep 17 00:00:00 2001
From: zhanglei <xx@cenxi.online>
Date: Mon, 10 Aug 2026 13:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/co/QualFilingPersonnelCertCO.java       | 14 ++++++++++++--
 .../client/co/QualFilingPersonnelChangeInfoCO.java |  6 ++++++
 .../mapper/QualFilingPersonnelChangeMapper.xml     |  1 +
 .../resources/mapper/QualFilingPersonnelMapper.xml | 13 +++++++++++--
 4 files changed, 30 insertions(+), 4 deletions(-)

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 a922c187..722a0057 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
@@ -1,8 +1,12 @@
 package org.qinan.safetyeval.client.co;
 
-import java.time.LocalDate;
-import lombok.Data;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.qinan.safetyeval.domain.entity.CapabilityAssessmentDTO;
+import org.qinan.safetyeval.domain.entity.TitleCodeCo;
+
+import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 备案申请人员证书CO（Client Object）
@@ -71,4 +75,10 @@ public class QualFilingPersonnelCertCO {
 
     @ApiModelProperty(value = "租户ID")
     private Long tenantId;
+
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
+    private List<TitleCodeCo> titleCodeArr;
+
+    @ApiModelProperty(value = "能力认定")
+    private List<CapabilityAssessmentDTO> capabilityAssessment;
 }
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelChangeInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelChangeInfoCO.java
index 0b0f44ed..80c09d39 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelChangeInfoCO.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelChangeInfoCO.java
@@ -50,6 +50,12 @@ public class QualFilingPersonnelChangeInfoCO {
     @ApiModelProperty(value = "参加工作日期")
     private LocalDate joinWorkDate;
 
+    @ApiModelProperty(value = "参加工作日期")
+    private String titleCodeArr;
+
+    @ApiModelProperty(value = "参加工作日期")
+    private String capabilityAssessment;
+
     @ApiModelProperty(value = "能力codeList")
     private List<String> professionalCapabilityCodeList;
 }
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml
index 35e878c7..9c87e0de 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml
@@ -89,6 +89,7 @@
     <select id="getFillingChangePersonInfo"
             resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelChangeInfoCO">
         SELECT fp.source_personnel_id, fp.id, p.user_name personName, po.position_name, p.post_id, p.gender_code, p.gender_name
+             , p.title_code_arr, p.capability_assessment
              , p.birth_date, p.register_engineer_flag, p.evaluator_cert_no, fp.filing_change_id, p.join_work_date, d.dept_name
         FROM org_personnel p
         join qual_filing_personnel_change fp on p.id = fp.source_personnel_id
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
index cf8a3d44..cbf6671e 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
@@ -48,9 +48,18 @@
         `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>
 
-    <select id="getFillingPersonInfo" resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
+    <!-- 资质备案人员分页查询 resultMap -->
+    <resultMap id="FilingPersonnelInfoMap" type="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
+        <result column="capability_assessment" property="capabilityAssessment"
+                typeHandler="org.qinan.safetyeval.infrastructure.handler.CapabilityAssessmentListTypeHandler"/>
+        <result column="title_code_arr" property="titleCodeArr"
+                typeHandler="org.qinan.safetyeval.infrastructure.handler.TitleCodeListTypeHandler"/>
+    </resultMap>
+
+    <select id="getFillingPersonInfo" resultMap="FilingPersonnelInfoMap">
         SELECT fp.source_personnel_id, fp.id, p.user_name personName, po.position_name, p.post_id, p.gender_code, p.gender_name
-        , p.birth_date, p.register_engineer_flag, p.technical_director_flag, p.process_control_leader_flag
+             , p.title_code_arr, p.capability_assessment
+             , p.birth_date, p.register_engineer_flag, p.technical_director_flag, p.process_control_leader_flag
         , p.evaluator_cert_no,fp.filing_id, p.join_work_date,d.dept_name
         FROM org_personnel p
         join qual_filing_personnel fp on p.id = fp.source_personnel_id