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/SafeTrainingMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeTrainingMapper.xml b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
new file mode 100644
index 0000000..473b5f2
--- /dev/null
+++ b/src/main/resources/mapper/safe/SafeTrainingMapper.xml
@@ -0,0 +1,59 @@
+<?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.SafeTrainingMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.safe.pojo.SafeTraining">
+ <id column="id" property="id" />
+ <result column="course_code" property="courseCode" />
+ <result column="training_objectives" property="trainingObjectives" />
+ <result column="training_content" property="trainingContent" />
+ <result column="training_mode" property="trainingMode" />
+ <result column="state" property="state" />
+ <result column="participants" property="participants" />
+ <result column="place_training" property="placeTraining" />
+ <result column="training_lecturer" property="trainingLecturer" />
+ <result column="training_date" property="trainingDate" />
+ <result column="opening_time" property="openingTime" />
+ <result column="end_time" property="endTime" />
+ <result column="project_credits" property="projectCredits" />
+ <result column="class_hour" property="classHour" />
+ <result column="assessment_method" property="assessmentMethod" />
+ <result column="comprehensive_assessment" property="comprehensiveAssessment" />
+ <result column="remarks" property="remarks" />
+ <result column="assessment_user_id" property="assessmentUserId" />
+ <result column="assessment_date" property="assessmentDate" />
+ <result column="training_abstract" property="trainingAbstract" />
+ <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="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 1=1
+ <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>
+ </select>
+ <select id="getSafeTraining" resultType="com.ruoyi.safe.dto.SafeTrainingDto">
+ select st.*,
+ su.nick_name assessmentUserName
+ from safe_training st
+ left join sys_user su on st.assessment_user_id = su.user_id
+ where st.id=#{id}
+ </select>
+
+</mapper>
--
Gitblit v1.9.3