From 106c97c11e283b60b05f6d4aa8175329dd71a1d5 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Wed, 9 Apr 2025 11:17:18 +0800
Subject: [PATCH] commit

---
 .../activity/controller/school/ActivityCommonController.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java
index 880f105..a30b662 100644
--- a/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java
+++ b/src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java
@@ -286,12 +286,14 @@ public class ActivityCommonController {
                  	app.unitname,
                  	u.idCard,
                  	u.userState,
+                 	u2.username applyUserName,
                     ev.allName,
                     sc.`name` activityName,
                     app.`team` team
                 FROM
                 	`activity_school_apply` app
                  	LEFT JOIN `user` u ON u.id = app.userId
+                 	LEFT JOIN `user` u2 ON u2.id = app.applyUser
                 	LEFT JOIN activity_event ev ON ev.id = app.eventId
                 	LEFT JOIN activity_school sc ON sc.id=app.activityId
                 WHERE
@@ -328,6 +330,7 @@ public class ActivityCommonController {
         exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20));
         exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20));
         exportEntities.add(new ExcelExportEntity("身份", "sf", 20));
+        exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20));
 
         response.setContentType("application/octet-stream");
         response.setHeader("Content-Disposition", "attachment;filename=" + new String((activityName + "报名表.xls").getBytes("utf-8"), "ISO8859-1"));