dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新10.25

Browse Source
This commit is contained in:
许允枞 2024-10-25 16:04:38 +08:00
parent 5f25237500
commit 847f821729
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java
View File

@ -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());

9
ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java
View File

@ -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;