From abd339106ed3a6465293edccd33e5f87bd43bdde Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 十月 2026 18:01:42 +0800
Subject: [PATCH] feat: 质量监控/人员培训对齐程序文件，体系文件控制附件格式放开
---
cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
index e0013ed..307c8ed 100644
--- a/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
+++ b/cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml
@@ -4,7 +4,7 @@
<select id="queryTheAnnualPlanDetailsTable" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
SELECT cptd.*,
- u1.name training_lecturer_name,
+ COALESCE(u1.name, cptd.training_lecturer_name) training_lecturer_name,
dl.name holding_department_name, !isnull(cptr.training_record_id) whether_claim
FROM cnas_person_training_detailed cptd
left join user u1 on cptd.training_lecturer_id = u1.id
@@ -18,7 +18,7 @@
and u1.id = #{userId}
</if>
<if test="trainingLecturerName != null and trainingLecturerName != ''">
- and u1.name like concat('%', #{trainingLecturerName}, '%')
+ and COALESCE(u1.name, cptd.training_lecturer_name) like concat('%', #{trainingLecturerName}, '%')
</if>
<if test="trainingDate != null and trainingDate != ''">
and date_format(cptd.training_date,'%Y-%m-%d') = #{trainingDate}
@@ -29,7 +29,7 @@
<!-- 鏍规嵁涓昏〃id鏌ヨ璇︽儏 -->
<select id="selectTrainingList" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
SELECT cptd.*,
- u1.name training_lecturer_name
+ COALESCE(u1.name, cptd.training_lecturer_name) training_lecturer_name
FROM cnas_person_training_detailed cptd
left join user u1 on cptd.training_lecturer_id = u1.id
where cptd.plan_id = #{trainingId}
@@ -38,7 +38,7 @@
<!-- 鏌ヨ璇︾粏 -->
<select id="selectTrainingDetail" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
SELECT cptd.*,
- u1.name training_lecturer_name,
+ COALESCE(u1.name, cptd.training_lecturer_name) training_lecturer_name,
u1.signature_url training_lecturer_signature_url
FROM cnas_person_training_detailed cptd
left join user u1 on cptd.training_lecturer_id = u1.id
--
Gitblit v1.9.3