From 6fc70907702f8de9638c9b946f4b86acd9d132c9 Mon Sep 17 00:00:00 2001
From: zhanglei <xx@cenxi.online>
Date: Mon, 10 Aug 2026 16:31:30 +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/QualFilingPersonnelChangeInfoCO.java    | 11 ++++++-----
 .../mapper/QualFilingPersonnelChangeMapper.xml        | 10 +++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

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 80c09d39..c568e305 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
@@ -2,6 +2,8 @@ package org.qinan.safetyeval.client.co;
 
 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;
@@ -50,11 +52,10 @@ public class QualFilingPersonnelChangeInfoCO {
     @ApiModelProperty(value = "参加工作日期")
     private LocalDate joinWorkDate;
 
-    @ApiModelProperty(value = "参加工作日期")
-    private String titleCodeArr;
-
-    @ApiModelProperty(value = "参加工作日期")
-    private String capabilityAssessment;
+    @ApiModelProperty(value = "能力认定")
+    private List<CapabilityAssessmentDTO> capabilityAssessment;
+    @ApiModelProperty(value = "职称(多个逗号分隔)")
+    private List<TitleCodeCo> titleCodeArr;
 
     @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 9c87e0de..051936b6 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml
@@ -86,8 +86,16 @@
         from qual_filing_personnel_change
     </sql>
 
+    <!-- 资质备案人员分页查询 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="getFillingChangePersonInfo"
-            resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelChangeInfoCO">
+            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.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