From 847f8217296cc03152d28ce4f00ac37ad91f5470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com> Date: Fri, 25 Oct 2024 16:04:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B010.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/cms/controller/HitRegInfoController.java | 3 +++ .../java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java index fc6f6b1..34c3b01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java @@ -87,10 +87,13 @@ public class HitRegInfoController extends BaseController HitRegInfoExportVo hitRegInfoExportVo = BeanUtil.copyProperties(hitRegInfo1, HitRegInfoExportVo.class); //设置领队老师 hitRegInfoExportVo.setLdTeacher(hitRegInfo1.getLdTeacher().getTeacherName()); + hitRegInfoExportVo.setLdTeacherPhone(hitRegInfo1.getLdTeacher().getTeacherNumber()); //设置指导老师 hitRegInfoExportVo.setZdlTeacher0(zdTeacher.get(0).getTeacherName()); + hitRegInfoExportVo.setZdlTeacher0Phone(zdTeacher.get(0).getTeacherNumber()); if (zdTeacher.size() > 1) { hitRegInfoExportVo.setZdlTeacher1(zdTeacher.get(1).getTeacherName()); + hitRegInfoExportVo.setZdlTeacher1Phone(zdTeacher.get(1).getTeacherNumber()); } hitRegInfoExportVo.setStudent1(hitRegInfo1.getStudentUserss().get(0).getStuName()); hitRegInfoExportVo.setStudent1Phone(hitRegInfo1.getStudentUserss().get(0).getPhoneNumber()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java index 2177764..c4d44ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java @@ -47,12 +47,21 @@ public class HitRegInfoExportVo { @Excel(name = "领队老师") private String ldTeacher; + @Excel(name = "领队老师电话") + private String ldTeacherPhone; + @Excel(name = "指导老师0") private String zdlTeacher0; + @Excel(name = "指导老师0电话") + private String zdlTeacher0Phone; + @Excel(name = "指导老师1") private String zdlTeacher1; + @Excel(name = "指导老师1电话") + private String zdlTeacher1Phone; + @Excel(name = "学生1") private String student1;