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 2bb068e..b186743 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 @@ -289,6 +289,7 @@ public class ActivityCommonController { app.activityUnionName unionname, app.sex, app.mobile, + app.position, app.unitname, u.idCard, u.userState, @@ -333,6 +334,7 @@ public class ActivityCommonController { exportEntities.add(new ExcelExportEntity("姓名", "username", 20)); exportEntities.add(new ExcelExportEntity("性别", "sex", 20)); exportEntities.add(new ExcelExportEntity("手机号码", "mobile", 20)); + exportEntities.add(new ExcelExportEntity("职称职务", "position", 20)); exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20)); exportEntities.add(new ExcelExportEntity("身份", "sf", 20)); exportEntities.add(new ExcelExportEntity("报名人", "applyUserName", 20)); diff --git a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java index 5fb1533..a6b24fa 100644 --- a/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java +++ b/src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java @@ -195,6 +195,12 @@ public class ActivitySchoolApply implements Serializable { @ColDefine(type = ColType.VARCHAR, width = 50) private String sex; + @Column + @Comment("职务") + @Excel(name = "职务", width = 20) + @ColDefine(type = ColType.VARCHAR, width = 50) + private String position; + @Excel(name = "在职状态", width = 20) private String userState; diff --git a/src/main/resources/views/platform/activity/school/ActivityApply.html b/src/main/resources/views/platform/activity/school/ActivityApply.html index 994181e..cac168a 100644 --- a/src/main/resources/views/platform/activity/school/ActivityApply.html +++ b/src/main/resources/views/platform/activity/school/ActivityApply.html @@ -257,13 +257,13 @@ layout("/layouts/platform.html"){
- +
+ prop="team" width="100"> + prop="username" width="100"> + prop="loginname" width="150"> + + - + - - + align="center" header-align="center" label="职务" + prop="position"> + + + @@ -983,6 +994,10 @@ layout("/layouts/platform.html"){ + + + @@ -1022,6 +1037,10 @@ layout("/layouts/platform.html"){ + + + -