From dfa9258c8879dbb0d1bfc00d7f939031d0bb623b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 29 一月 2026 18:32:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml b/src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml
new file mode 100644
index 0000000..c96d711
--- /dev/null
+++ b/src/main/resources/mapper/safe/SafeTrainingDetailsMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.safe.mapper.SafeTrainingDetailsMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.safe.pojo.SafeTrainingDetails">
+ <id column="id" property="id"/>
+ <result column="user_id" property="userId"/>
+ <result column="safe_training_id" property="safeTrainingId"/>
+ <result column="examination_results" property="examinationResults"/>
+ <result column="create_time" property="createTime"/>
+ <result column="create_user" property="createUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="tenant_id" property="tenantId"/>
+ </resultMap>
+ <select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDetailsDto">
+ select std.*,
+ su.user_name,
+ su.nick_name,
+ su.phonenumber
+ from safe_training_details std
+ left join sys_user su on std.user_id = su.user_id
+ where std.safe_training_id = #{id}
+ </select>
+ <select id="pageDetails" resultType="com.ruoyi.safe.pojo.SafeTrainingDetails">
+ select std.*,
+ st.*
+ from safe_training_details std
+ left join safe_training st on std.safe_training_id = st.id
+ where std.user_id = #{c.userId}
+ <if test="c.trainingDate != null">
+ and st.training_date = #{c.trainingDate}
+ </if>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3