From 74f9e1f4f009907d4f8ebda80f522a25a25f87f2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 11 三月 2026 10:32:59 +0800
Subject: [PATCH] fix:同步（安全培训-筛选优化）
---
src/main/resources/mapper/safe/SafeTrainingMapper.xml | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index 1ae5159..14f0a37 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -31,19 +31,21 @@
<result column="tenant_id" property="tenantId" />
</resultMap>
<select id="pageSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
- select st.*,
- su.nick_name assessmentUserName,
- count(std.id) nums
- from safe_training st
- left join safe_training_details std on std.safe_training_id = st.id
- left join sys_user su on st.assessment_user_id = su.user_id
- where st.state = #{c.state}
+ SELECT
+ st.*,
+ su.nick_name AS assessmentUserName,
+ COUNT(std.id) AS nums
+ FROM safe_training st
+ LEFT JOIN safe_training_details std ON std.safe_training_id = st.id
+ LEFT JOIN sys_user su ON st.assessment_user_id = su.user_id
+ WHERE st.state = #{c.state}
<if test="c.placeTraining != null and c.placeTraining != ''">
- and st.place_training like concat('%', #{c.placeTraining}, '%')
+ AND st.place_training LIKE CONCAT('%', #{c.placeTraining}, '%')
</if>
- <if test="c.trainingDate != null and c.trainingDate != ''">
- and st.training_date = #{c.trainingDate}
+ <if test="c.trainingDate != null ">
+ AND DATE_FORMAT(st.training_date, '%Y%m%d') = DATE_FORMAT(#{c.trainingDate}, '%Y%m%d')
</if>
+ GROUP BY st.id, su.nick_name
</select>
<select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
select st.*,
--
Gitblit v1.9.3