导出字段返回

competition/src/main/java/com/huoran/competition/entity/vo/ImportTeamFailureVo.java

@@ -14,44 +14,44 @@ import lombok.experimental.Accessors;
 @ExcelTarget("ImportTeamFailureVo")
 public class ImportTeamFailureVo {
 
-    @Excel(name = "学生账号归属", orderNum = "1", isImportField = "id", width = 30)
+    @Excel(name = "学生账号归属", orderNum = "1", isImportField = "studentAccountOwnership", width = 30)
     @ApiModelProperty(value = "学生账号归属")
     private String studentAccountOwnership;
 
     @ApiModelProperty(value = "学生所在院校")
-    @Excel(name = "学生所在院校", orderNum = "2", isImportField = "roleName", width = 30)
+    @Excel(name = "学生所在院校", orderNum = "2", isImportField = "studentAffiliatedInstitution", width = 30)
     private String studentAffiliatedInstitution;
 
     @ApiModelProperty(value = "团队名称")
-    @Excel(name = "团队名称", orderNum = "3", isImportField = "workNumber", width = 30)
+    @Excel(name = "团队名称", orderNum = "3", isImportField = "teamName", width = 30)
     private String teamName;
 
     @ApiModelProperty(value = "队长/成员")
-    @Excel(name = "队长/成员", orderNum = "4", isImportField = "firstDept", width = 30)
+    @Excel(name = "队长/成员", orderNum = "4", isImportField = "studentName", width = 30)
     private String studentName;
 
-    @ApiModelProperty(value = "队长/成员学号")
-    @Excel(name = "队长/成员学号", orderNum = "5", isImportField = "secondDept", width = 20)
-    private String workNumber;
+    @ApiModelProperty(value = "队长/成员账号")
+    @Excel(name = "队长/成员账号", orderNum = "5", isImportField = "account", width = 20)
+    private String account;
 
     @ApiModelProperty(value = "队长/成员手机号")
-    @Excel(name = "队长/成员手机号", orderNum = "6", isImportField = "phone", width = 20)
+    @Excel(name = "队长/成员手机号", orderNum = "6", isImportField = "userPhoneNumber", width = 20)
     private String userPhoneNumber;
 
     @ApiModelProperty(value = "是否为队长")
-    @Excel(name = "是否为队长", orderNum = "7", isImportField = "email", width = 20)
+    @Excel(name = "是否为队长", orderNum = "7", isImportField = "captain", width = 20)
     private String captain;
 
     @ApiModelProperty(value = "指导老师")
-    @Excel(name = "指导老师", orderNum = "8", isImportField = "email", width = 20)
+    @Excel(name = "指导老师", orderNum = "8", isImportField = "teacherName", width = 20)
     private String teacherName;
 
     @ApiModelProperty(value = "指导老师手机号")
-    @Excel(name = "指导老师手机号", orderNum = "9", isImportField = "email", width = 20)
+    @Excel(name = "指导老师手机号", orderNum = "9", isImportField = "teacherPhone", width = 20)
     private String teacherPhone;
 
     @ApiModelProperty(value = "指导老师职务")
-    @Excel(name = "指导老师职务", orderNum = "10", isImportField = "email", width = 20)
+    @Excel(name = "指导老师职务", orderNum = "10", isImportField = "teacherPosition", width = 20)
     private String teacherPosition;
 
     @ExcelAttribute(sort = 8)

competition/src/main/java/com/huoran/competition/entity/vo/PersonalExcelData.java

@@ -23,9 +23,9 @@ public class PersonalExcelData {
     @Excel(name = "学生姓名", orderNum = "3",  isImportField = "username", width = 30)
     private String username;
 
-    @ApiModelProperty(value = "学号")
-    @Excel(name = "学号", orderNum = "4",  isImportField = "workNumber", width = 30)
-    private String workNumber;
+    @ApiModelProperty(value = "账号")
+    @Excel(name = "账号", orderNum = "4",  isImportField = "account", width = 30)
+    private String account;
 
     @ApiModelProperty(value = "手机号")
     @Excel(name = "手机号", orderNum = "5",  isImportField = "phone", width = 30)

competition/src/main/java/com/huoran/competition/entity/vo/RegistrationVO.java

@@ -23,9 +23,9 @@ public class RegistrationVO {
     @Excel(name = "学生姓名", orderNum = "4", isImportField = "username", width = 30)
     private String username;
 
-    @ApiModelProperty(value = "学号")
-    @Excel(name = "学号", orderNum = "5", isImportField = "workNumber", width = 30)
-    private String workNumber;
+    @ApiModelProperty(value = "账号")
+    @Excel(name = "账号", orderNum = "5", isImportField = "account", width = 30)
+    private String account;
 
     @ApiModelProperty(value = "手机号")
     @Excel(name = "手机号", orderNum = "6",  isImportField = "phone", width = 30)
@@ -86,6 +86,9 @@ public class RegistrationVO {
     @ApiModelProperty(value = "报名id")
     private Integer id;
 
+    @ApiModelProperty(value = "学号")
+    private String workNumber;
+
     @ApiModelProperty(value = "是否禁用")
     private Integer isDisable;
 

competition/src/main/java/com/huoran/competition/entity/vo/TeamExcelData.java

@@ -32,9 +32,9 @@ public class TeamExcelData {
     @Excel(name = "队长/成员", orderNum = "4", isImportField = "username", width = 30)
     private String username;
 
-    @ApiModelProperty(value = "队长/成员学号")
-    @Excel(name = "队长/成员学号", orderNum = "5", isImportField = "workNumber", width = 30)
-    private String workNumber;
+    @ApiModelProperty(value = "队长/成员账号")
+    @Excel(name = "队长/成员账号", orderNum = "5", isImportField = "workNumber", width = 30)
+    private String account;
 
     @ApiModelProperty(value = "队长/成员手机号")
     @Excel(name = "队长/成员手机号", orderNum = "6", isImportField = "phone", width = 30)

competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionRegistrationMapper.xml

@@ -66,6 +66,7 @@
         (SELECT s.is_del FROM nakadai.school s WHERE s.school_id = qa.real_school_id ) AS realSchoolStatus,
         qa.real_school_id as studentAffiliatedInstitutionId,
         ua.school_id,
+        ua.account,
         u.user_name AS username,
         u.user_id,
         u.email,