diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsTrainingRecord.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsTrainingRecord.java index dfb1dc40..5de22922 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsTrainingRecord.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/domain/RsTrainingRecord.java @@ -127,4 +127,14 @@ public class RsTrainingRecord extends BaseEntity { private String courseName; private Integer duration; private String location; + + // 关联字段 - 从申请表关联查询(不存储在记录表中) + @TableField(exist = false) + private String organizerUnit; // 主办单位 + + @TableField(exist = false) + private String trainingType; // 培训类型 + + @TableField(exist = false) + private String companions; // 同行人员 } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsTrainingRecordMapper.xml b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsTrainingRecordMapper.xml index d26766c6..26d133c5 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsTrainingRecordMapper.xml +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/resources/mapper/rs/RsTrainingRecordMapper.xml @@ -37,6 +37,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -44,8 +49,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" r.completion_status, r.completion_time, r.score, r.certificate_path, r.certificate_number, r.attachment_ids, r.feedback, r.tenant_id, r.create_dept, r.create_by, r.create_time, r.update_by, r.update_time, r.department, r.position, r.reason, r.status, r.apply_time, r.current_approver, r.start_time, r.end_time, - r.course_name, r.duration, r.location, r.dept_id + r.course_name, r.duration, r.location, r.dept_id, + a.course_name as organizer_unit, a.training_type, a.companions from rs_training_record r + left join rs_training_application a on r.application_id = a.application_id and a.deleted = '0'