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 e62cc2e..78e26b1 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 @@ -310,16 +310,14 @@ public class ActivityCommonController { sql.setVar("cnd", "and u.unionid='" + unionId + "'"); } - List list = activitySchoolApplyService.list(sql); + List list = activitySchoolApplyService.listMap(sql); String activityName = list.get(0).getString("activityName"); - List excels = new ArrayList<>(); list.forEach(z -> { - ActivitySchoolApply schoolApply = z.toPojo(ActivitySchoolApply.class); - String s = schoolApply.getIdentity().stream().map(personType::getName).collect(Collectors.toList()).toString(); - schoolApply.setSf(s); - excels.add(schoolApply); + List identity = Json.fromJsonAsList(String.class, z.getString("identity")); + String s = identity.stream().map(personType::getName).collect(Collectors.toList()).toString(); + z.addv("sf", s); }); List exportEntities = new ArrayList<>(); exportEntities.add(new ExcelExportEntity("小队名称", "team", 20)); @@ -334,7 +332,7 @@ public class ActivityCommonController { response.setContentType("application/octet-stream"); response.setHeader("Content-Disposition", "attachment;filename=" + new String((activityName + "报名表.xls").getBytes("utf-8"), "ISO8859-1")); - Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), exportEntities, excels); + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), exportEntities, list); workbook.write(response.getOutputStream()); }