Browse Source

导出Excel时,加入学习中心名称及课程名称

chenken 7 years ago
parent
commit
0af30aeca8

+ 18 - 22
exam-work-domain/src/main/java/cn/com/qmth/examcloud/service/examwork/dto/ExamStudentDTO.java

@@ -21,23 +21,25 @@ public class ExamStudentDTO {
 	 * 学习中心id
 	 */
     private Long orgId;
-	/**
-	 * 学习中心code
-	 */
-    @ExcelProperty(index = 3,name = "学习中心代码")
-    private String orgCode;
-    
-    private String orgName;
 
     @ExcelProperty(index = 1,name = "学号")
 	private String studentCode;
     @ExcelProperty(index = 2,name = "身份证号")
 	private String identityNumber;
-
+    /**
+	 * 学习中心code
+	 */
+    @ExcelProperty(index = 3,name = "学习中心代码")
+    private String orgCode;
+    @ExcelProperty(index = 4,name = "学习中心名称")
+    private String orgName;
+    
 	private String examNumber;
-	@ExcelProperty(index = 4,name = "课程代码")
+	
+	@ExcelProperty(index = 5,name = "课程代码")
 	private String courseCode;
-
+	
+	@ExcelProperty(index = 6,name = "课程名称")
 	private String courseName;
 	
 	private String courseLevel;
@@ -45,18 +47,16 @@ public class ExamStudentDTO {
 	/**
 	 * 试卷类型
 	 */
-	@ExcelProperty(index = 5,name = "试卷类型")
+	@ExcelProperty(index = 7,name = "试卷类型")
 	private String paperType;
 	/**
 	 * 学位
 	 */
 	private Boolean degree;
 
-
-
 	private String specialtyCode;
 
-	@ExcelProperty(index = 6,name = "专业")
+	@ExcelProperty(index = 8,name = "专业")
 	private String specialtyName;
 	
 	/**
@@ -64,7 +64,6 @@ public class ExamStudentDTO {
 	 */
 	private Boolean repair;
 	
-	
 	/**
 	 * 是否毕业
 	 */
@@ -73,28 +72,25 @@ public class ExamStudentDTO {
 	private String remark;
 	
 	private Long studentId;
-	
 	/**
 	 * 是否缺考 
 	 */
 	private Boolean finished;
-
 	/**
 	 * 考点
      */
-	@ExcelProperty(index = 7,name = "考点")
+	@ExcelProperty(index = 9,name = "考点")
 	private String examSite;
 
-	@ExcelProperty(index = 8,name = "信息采集人")
+	@ExcelProperty(index = 10,name = "信息采集人")
 	private String infoCollector;
 	
-	@ExcelProperty(index = 9,name = "学生电话")
+	@ExcelProperty(index = 11,name = "学生电话")
 	private String phone;
-	
 	/**
 	 * 年级
 	 */
-	@ExcelProperty(index = 10,name = "年级")
+	@ExcelProperty(index = 12,name = "年级")
 	private String grade;
 	
 	public Long getId() {