From bb78ea38792502cbff36c9a4486b7b12e1940615 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 10:59:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/safe/SafeTrainingMapper.xml | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
index 473b5f2..b45878c 100644
--- a/src/main/resources/mapper/safe/SafeTrainingMapper.xml
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -37,15 +37,13 @@
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 1=1
+ where st.state = #{c.state}
+ GROUP BY st.id
<if test="c.placeTraining != null and 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>
- <if test="c.state != null and c.state != ''">
- and st.state like concat('%', #{c.state}, '%')
+ <if test="c.trainingDate != null ">
+ and st.training_date = date_format(#{c.trainingDate},'%Y%m%d')
</if>
</select>
<select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
--
Gitblit v1.9.3