From b129977dbaff2501459009577667ab11ed0163ab Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 28 十月 2024 18:31:07 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/jxkg-new --- src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java b/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java index d60564e..3abdb6a 100644 --- a/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java +++ b/src/main/java/com/ycl/jxkg/domain/vo/student/exampaper/ExamPaperAnswerExportVO.java @@ -12,18 +12,24 @@ */ @Data -@ColumnWidth(18) +@ColumnWidth(22) @ContentStyle(horizontalAlignment= HorizontalAlignmentEnum.CENTER) public class ExamPaperAnswerExportVO { + + @ExcelProperty("鑰冭瘯鍚嶇О") + private String examName; + + @ExcelProperty("璇曞嵎鍚嶇О") + private String paperName; @ExcelProperty("濮撳悕") private String userName; @ExcelProperty("鍒嗘暟") - private String userScore; + private String score; @ExcelProperty("鎬诲垎") - private String paperScore; + private String totalScore; @ExcelProperty("姝g‘棰樻暟") private Integer questionCorrect; @@ -31,10 +37,10 @@ @ExcelProperty("棰樼洰鎬绘暟") private Integer questionCount; - @ExcelProperty("绛旈鏃堕棿") + @ExcelProperty("绛旈鏃堕棿锛堢锛�") private String doTime; @ExcelProperty("鎻愪氦鏃堕棿") - private String createTime; + private String submitTime; } -- Gitblit v1.8.0