|
|
@@ -1,5 +1,6 @@
|
|
|
package org.dromara.main.mapper;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
|
|
|
import org.apache.ibatis.annotations.Mapper;
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
|
import org.apache.ibatis.annotations.Select;
|
|
|
@@ -44,6 +45,7 @@ public interface MainTrainingLearnRecordMapper extends BaseMapperPlus<MainTraini
|
|
|
* 查询学员全部培训记录(合并线上视频培训 + 线下培训报名)
|
|
|
* 关联 main_training 表获取培训名称、类型、时间
|
|
|
*/
|
|
|
+ @InterceptorIgnore(tenantLine = "true")
|
|
|
@Select("""
|
|
|
SELECT r.id,
|
|
|
r.training_id AS trainingId,
|
|
|
@@ -57,7 +59,7 @@ public interface MainTrainingLearnRecordMapper extends BaseMapperPlus<MainTraini
|
|
|
NULL AS enrollStatus,
|
|
|
NULL AS checkInTime
|
|
|
FROM main_training_learn_record r
|
|
|
- LEFT JOIN main_training t ON t.id = r.training_id AND t.del_flag = '0'
|
|
|
+ LEFT JOIN main_training t ON t.id = r.training_id
|
|
|
WHERE r.student_id = #{studentId}
|
|
|
AND r.del_flag = '0'
|
|
|
|
|
|
@@ -75,7 +77,7 @@ public interface MainTrainingLearnRecordMapper extends BaseMapperPlus<MainTraini
|
|
|
e.enroll_status AS enrollStatus,
|
|
|
e.check_in_time AS checkInTime
|
|
|
FROM main_training_enrollment e
|
|
|
- LEFT JOIN main_training t ON t.id = e.training_id AND t.del_flag = '0'
|
|
|
+ LEFT JOIN main_training t ON t.id = e.training_id
|
|
|
WHERE e.student_id = #{studentId}
|
|
|
AND e.del_flag = '0'
|
|
|
|