From 8753a4f45a91061c3c3f5f1470caf82a8489bc4b Mon Sep 17 00:00:00 2001
From: zhanglei <xx@cenxi.online>
Date: Mon, 10 Aug 2026 18:15:06 +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       | 9 +++++++++
 .../resources/mapper/QualFilingPersonnelChangeMapper.xml | 9 +++++----
 2 files changed, 14 insertions(+), 4 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 c568e305..37d33041 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
@@ -59,4 +59,13 @@ public class QualFilingPersonnelChangeInfoCO {
 
     @ApiModelProperty(value = "能力codeList")
     private List<String> professionalCapabilityCodeList;
+
+    @ApiModelProperty(value = "专业")
+    private String basicDisciplineMajorName;
+
+    @ApiModelProperty(value = "学历")
+    private String educationName;
+
+    @ApiModelProperty(value = "是否管理人员")
+    private Boolean technicalDirectorFlag;
 }
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml
index 7af63ca1..35e5e3a5 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelChangeMapper.xml
@@ -86,8 +86,8 @@
         from qual_filing_personnel_change
     </sql>
 
-    <!-- 资质备案人员分页查询 resultMap -->
-    <resultMap id="FilingPersonnelInfoMap" type="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
+    <!-- 资质备案变更人员查询 resultMap -->
+    <resultMap id="FilingPersonnelChangeInfoMap" type="org.qinan.safetyeval.client.co.QualFilingPersonnelChangeInfoCO">
         <result column="capability_assessment" property="capabilityAssessment"
                 typeHandler="org.qinan.safetyeval.infrastructure.handler.CapabilityAssessmentListTypeHandler"/>
         <result column="title_code_arr" property="titleCodeArr"
@@ -95,12 +95,13 @@
     </resultMap>
 
     <select id="getFillingChangePersonInfo"
-            resultMap="FilingPersonnelInfoMap">
+            resultMap="FilingPersonnelChangeInfoMap">
         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.title_code_arr, p.technical_director_flag, p.capability_assessment, p.education_name, bdm.professional_name  basicDisciplineMajorName
              , 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
+        left join basic_discipline_major bdm on  p.basic_discipline_major_id = bdm.id
         left join org_department d on p.dept_id = d.id and d.delete_enum = 'false'
         left join org_position po on po.id = p.post_id and po.delete_enum = 'false'
         WHERE fp.filing_change_id = #{filingChangeId}