commit
This commit is contained in:
@@ -286,12 +286,14 @@ public class ActivityCommonController {
|
|||||||
app.unitname,
|
app.unitname,
|
||||||
u.idCard,
|
u.idCard,
|
||||||
u.userState,
|
u.userState,
|
||||||
|
u2.username applyUserName,
|
||||||
ev.allName,
|
ev.allName,
|
||||||
sc.`name` activityName,
|
sc.`name` activityName,
|
||||||
app.`team` team
|
app.`team` team
|
||||||
FROM
|
FROM
|
||||||
`activity_school_apply` app
|
`activity_school_apply` app
|
||||||
LEFT JOIN `user` u ON u.id = app.userId
|
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_event ev ON ev.id = app.eventId
|
||||||
LEFT JOIN activity_school sc ON sc.id=app.activityId
|
LEFT JOIN activity_school sc ON sc.id=app.activityId
|
||||||
WHERE
|
WHERE
|
||||||
@@ -328,6 +330,7 @@ public class ActivityCommonController {
|
|||||||
exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20));
|
exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20));
|
exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("身份", "sf", 20));
|
exportEntities.add(new ExcelExportEntity("身份", "sf", 20));
|
||||||
|
exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20));
|
||||||
|
|
||||||
response.setContentType("application/octet-stream");
|
response.setContentType("application/octet-stream");
|
||||||
response.setHeader("Content-Disposition", "attachment;filename=" + new String((activityName + "报名表.xls").getBytes("utf-8"), "ISO8859-1"));
|
response.setHeader("Content-Disposition", "attachment;filename=" + new String((activityName + "报名表.xls").getBytes("utf-8"), "ISO8859-1"));
|
||||||
|
|||||||
Reference in New Issue
Block a user