From 6be986820737aa32fd5bee740aa0d6b43845ab8e Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Sat, 8 Aug 2026 15:05:40 +0800
Subject: [PATCH] upgrade

---
 .../safetyeval/client/co/QualFilingPersonnelInfoCO.java  | 6 ++++++
 .../client/dto/OrgFilingPersonnelPageQuery.java          | 3 +++
 .../domain/entity/CapabilityAssessmentDTO.java           | 1 -
 .../src/main/resources/mapper/OrgPersonnelMapper.xml     | 9 ++++++++-
 .../main/resources/mapper/QualFilingPersonnelMapper.xml  | 3 ++-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java
index 695f914f..288431ad 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/QualFilingPersonnelInfoCO.java
@@ -44,6 +44,12 @@ public class QualFilingPersonnelInfoCO {
     @ApiModelProperty(value = "是否注册安全工程师(1是2否)")
     private Integer registerEngineerFlag;
 
+    @ApiModelProperty(value = "是否技术负责人(0否1是)")
+    private Integer technicalDirectorFlag;
+
+    @ApiModelProperty(value = "是否过程控制负责人(0否1是)")
+    private Integer processControlLeaderFlag;
+
     @ApiModelProperty(value = "评价师证书编号")
     private String evaluatorCertNo;
 
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java
index 300fa209..778dd80b 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/OrgFilingPersonnelPageQuery.java
@@ -18,4 +18,7 @@ public class OrgFilingPersonnelPageQuery extends BasePageQuery {
 
     @ApiModelProperty(value = "人员姓名")
     private String personName;
+
+    @ApiModelProperty(value = "是否管理人员")
+    private Boolean managementFlag;
 }
diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java
index e2b6c157..38d634ad 100644
--- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java
+++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/entity/CapabilityAssessmentDTO.java
@@ -17,7 +17,6 @@ public class CapabilityAssessmentDTO implements Serializable {
     /**
      * 专业能力编码，取值见
      * {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilityEnum}
-     * {@link org.qinan.safetyeval.domain.constant.basic.ProfessionalCapabilitySourceEnum}
      */
     private String professionalCapabilityCode;
 
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml
index 769a512e..f3132a48 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/OrgPersonnelMapper.xml
@@ -71,7 +71,8 @@
     <!-- 资质备案人员分页查询，直接返回 CO -->
     <select id="filingPage" resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
         SELECT p.id source_personnel_id, p.id, p.user_name personName, d.dept_name, po.position_name, p.post_id, p.gender_code, p.gender_name
-             , p.birth_date, p.register_engineer_flag, p.evaluator_cert_no, p.join_work_date
+             , p.birth_date, p.register_engineer_flag, p.technical_director_flag, p.process_control_leader_flag
+             , p.evaluator_cert_no, p.join_work_date
         FROM org_personnel p
         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'
@@ -81,6 +82,12 @@
             <if test="query.personName != null and query.personName != ''">
                 AND p.user_name LIKE CONCAT('%', #{query.personName}, '%')
             </if>
+            <if test="query.managementFlag != null and query.managementFlag == true">
+                AND (p.technical_director_flag =1 or p.process_control_leader_flag =1)
+            </if>
+            <if test="query.managementFlag != null and query.managementFlag == false">
+                AND (p.technical_director_flag !=1 and p.process_control_leader_flag !=1)
+            </if>
         </where>
         ORDER BY p.id DESC
     </select>
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
index 7f574488..cf8a3d44 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/QualFilingPersonnelMapper.xml
@@ -50,7 +50,8 @@
 
     <select id="getFillingPersonInfo" resultType="org.qinan.safetyeval.client.co.QualFilingPersonnelInfoCO">
         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.evaluator_cert_no,fp.filing_id, p.join_work_date,d.dept_name
+        , 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
         left join org_department d on p.dept_id  = d.id and d.delete_enum = 'false'