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' diff --git a/web/src/api/rs/training.ts b/web/src/api/rs/training.ts index 6b82e408..e57bd961 100644 --- a/web/src/api/rs/training.ts +++ b/web/src/api/rs/training.ts @@ -163,6 +163,12 @@ export interface RecordVO { createBy: string; updateBy: string; remark: string; + // 关联字段 - 从申请表获取 + organizerUnit?: string; // 主办单位 + trainingType?: string; // 培训类型 + companions?: string; // 同行人员 + startTime?: string; // 开始时间 + endTime?: string; // 结束时间 } // 培训记录表单类型 diff --git a/web/src/views/rs/training/index.vue b/web/src/views/rs/training/index.vue index 32e0e48f..7ac22c3f 100644 --- a/web/src/views/rs/training/index.vue +++ b/web/src/views/rs/training/index.vue @@ -213,20 +213,44 @@ @row-dblclick="handleViewRecord" > - - - - + + - - {{ scope.row.completionStatus === '0' ? '未完成' : scope.row.completionStatus === '1' ? '已完成' : '未知' }} - + {{ scope.row.organizerUnit || '暂无' }} - - + + - {{ parseTime(scope.row.completionTime) || '未完成' }} + {{ scope.row.trainingType || '暂无' }} + + + + + + {{ parseTime(scope.row.startTime) || '暂无' }} + + + + + + {{ parseTime(scope.row.endTime) || '暂无' }} + + + + + + + {{ formatCompanions(scope.row.companions) }} + + 无 + + + + + + {{ getCompletionStatusLabel(scope.row.completionStatus) }} + @@ -742,7 +766,6 @@ - 进行中 已完成 未完成 @@ -860,79 +883,58 @@ - + - {{ recordDetail.courseName }} + {{ recordDetail.userName }} + {{ recordDetail.department || '暂无' }} + {{ recordDetail.currentTitle || '暂无' }} + {{ recordDetail.currentPosition || '暂无' }} + {{ parseTime(recordDetail.workStartTime) || '暂无' }} + {{ recordDetail.phone || '暂无' }} + + + {{ recordDetail.organizerUnit || recordDetail.courseName || '暂无' }} + {{ recordDetail.location || '暂无' }} + {{ parseTime(recordDetail.startTime) || '暂无' }} + {{ parseTime(recordDetail.endTime) || '暂无' }} + {{ recordDetail.trainingType || '暂无' }} + {{ recordDetail.trainingFee ? `${recordDetail.trainingFee}元` : '暂无' }} + {{ parseTime(recordDetail.applyTime) || '暂无' }} - - {{ recordDetail.completionStatus === '0' ? '进行中' : recordDetail.completionStatus === '1' ? '已完成' : '未完成' }} + + {{ getCompletionStatusLabel(recordDetail.completionStatus) }} - {{ recordDetail.duration || '暂无' }} - {{ parseTime(recordDetail.completionTime) || '未完成' }} - - - - - - - - - - - 加载失败 - - - - - - 加载中... - - - - - - - - 查看原图 - - - - 下载证书 - - - - - - - - {{ recordDetail.certificateNumber || '无' }} - {{ parseTime(recordDetail.createTime) }} - - {{ recordDetail.feedback || '暂无反馈' }} - + {{ getCompanionNames(recordDetail.companions) || '无' }} + {{ recordDetail.trainingPurpose || recordDetail.reason || '暂无' }} {{ recordDetail.remark || '暂无备注' }} + + + + + + 申请附件 + + + + + + + {{ parseTime(scope.row.uploadTime) }} + + + + + + 下载 + + + + + +