|
@@ -4,6 +4,7 @@ import java.util.Date;
|
|
|
|
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
|
|
import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
|
|
import cn.com.qmth.stmms.biz.mark.model.MarkLibrary;
|
|
import cn.com.qmth.stmms.biz.mark.model.MarkLibrary;
|
|
|
|
+import cn.com.qmth.stmms.common.annotation.ExcelField;
|
|
import cn.com.qmth.stmms.common.enums.LibraryStatus;
|
|
import cn.com.qmth.stmms.common.enums.LibraryStatus;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
|
|
|
@@ -21,12 +22,14 @@ public class MarkLibraryVo {
|
|
/**
|
|
/**
|
|
* 科目CODE
|
|
* 科目CODE
|
|
*/
|
|
*/
|
|
|
|
+ @ExcelField(title = "科目代码", align = 2, sort = 10)
|
|
@ApiModelProperty("科目CODE")
|
|
@ApiModelProperty("科目CODE")
|
|
private String subjectCode;
|
|
private String subjectCode;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 大题序号
|
|
* 大题序号
|
|
*/
|
|
*/
|
|
|
|
+ @ExcelField(title = "分组序号", align = 2, sort = 20)
|
|
@ApiModelProperty("分组号")
|
|
@ApiModelProperty("分组号")
|
|
private Integer groupNumber;
|
|
private Integer groupNumber;
|
|
|
|
|
|
@@ -39,12 +42,14 @@ public class MarkLibraryVo {
|
|
/**
|
|
/**
|
|
* 准考证号
|
|
* 准考证号
|
|
*/
|
|
*/
|
|
|
|
+ @ExcelField(title = "准考证号", align = 2, sort = 30)
|
|
@ApiModelProperty("准考证号")
|
|
@ApiModelProperty("准考证号")
|
|
private String examNumber;
|
|
private String examNumber;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 考生密号
|
|
* 考生密号
|
|
*/
|
|
*/
|
|
|
|
+ @ExcelField(title = "密号", align = 2, sort = 40)
|
|
@ApiModelProperty("考生密号")
|
|
@ApiModelProperty("考生密号")
|
|
private String secretNumber;
|
|
private String secretNumber;
|
|
|
|
|
|
@@ -60,18 +65,27 @@ public class MarkLibraryVo {
|
|
@ApiModelProperty("任务状态")
|
|
@ApiModelProperty("任务状态")
|
|
private LibraryStatus status;
|
|
private LibraryStatus status;
|
|
|
|
|
|
|
|
+ @ExcelField(title = "状态", align = 2, sort = 50)
|
|
|
|
+ private String statusText;
|
|
|
|
+
|
|
|
|
+ @ExcelField(title = "打回原因", align = 2, sort = 60)
|
|
|
|
+ @ApiModelProperty("打回原因")
|
|
|
|
+ private String rejectReason;
|
|
|
|
+
|
|
|
|
+ @ExcelField(title = "评卷员", align = 2, sort = 70)
|
|
|
|
+ @ApiModelProperty("评卷员登录名")
|
|
|
|
+ private String markerLoginName;
|
|
|
|
+
|
|
|
|
+ @ExcelField(title = "评卷总分", align = 2, sort = 80)
|
|
|
|
+ @ApiModelProperty("评卷总分显示值")
|
|
|
|
+ private String markerScoreText;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 评卷员
|
|
* 评卷员
|
|
*/
|
|
*/
|
|
@ApiModelProperty("评卷员id")
|
|
@ApiModelProperty("评卷员id")
|
|
private Integer markerId;
|
|
private Integer markerId;
|
|
|
|
|
|
- /**
|
|
|
|
- * 评卷时间
|
|
|
|
- */
|
|
|
|
- @ApiModelProperty("评卷时间")
|
|
|
|
- private Date markerTime;
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 评卷员给分总分
|
|
* 评卷员给分总分
|
|
*/
|
|
*/
|
|
@@ -81,9 +95,17 @@ public class MarkLibraryVo {
|
|
/**
|
|
/**
|
|
* 评卷员给分明细
|
|
* 评卷员给分明细
|
|
*/
|
|
*/
|
|
|
|
+ @ExcelField(title = "给分明细", align = 2, sort = 90)
|
|
@ApiModelProperty("评卷员给分明细")
|
|
@ApiModelProperty("评卷员给分明细")
|
|
private String markerScoreList;
|
|
private String markerScoreList;
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 评卷时间
|
|
|
|
+ */
|
|
|
|
+ @ExcelField(title = "评卷时间", align = 2, sort = 100)
|
|
|
|
+ @ApiModelProperty("评卷时间")
|
|
|
|
+ private Date markerTime;
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 评卷时长
|
|
* 评卷时长
|
|
*/
|
|
*/
|
|
@@ -96,12 +118,6 @@ public class MarkLibraryVo {
|
|
@ApiModelProperty("科组长id")
|
|
@ApiModelProperty("科组长id")
|
|
private Integer headerId;
|
|
private Integer headerId;
|
|
|
|
|
|
- /**
|
|
|
|
- * 科组长评卷时间
|
|
|
|
- */
|
|
|
|
- @ApiModelProperty("科组长评卷时间")
|
|
|
|
- private Date headerTime;
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 科组长给分总分
|
|
* 科组长给分总分
|
|
*/
|
|
*/
|
|
@@ -120,18 +136,20 @@ public class MarkLibraryVo {
|
|
@ApiModelProperty("未作答的步骤数量")
|
|
@ApiModelProperty("未作答的步骤数量")
|
|
private Integer unansweredCount;
|
|
private Integer unansweredCount;
|
|
|
|
|
|
- @ApiModelProperty("打回原因")
|
|
|
|
- private String rejectReason;
|
|
|
|
-
|
|
|
|
- @ApiModelProperty("评卷员登录名")
|
|
|
|
- private String markerLoginName;
|
|
|
|
-
|
|
|
|
@ApiModelProperty("分组名")
|
|
@ApiModelProperty("分组名")
|
|
private String title;
|
|
private String title;
|
|
|
|
|
|
|
|
+ @ExcelField(title = "复核人", align = 2, sort = 110)
|
|
@ApiModelProperty("科组长登录名")
|
|
@ApiModelProperty("科组长登录名")
|
|
private String headerLoginName;
|
|
private String headerLoginName;
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 科组长评卷时间
|
|
|
|
+ */
|
|
|
|
+ @ExcelField(title = "复核时间", align = 2, sort = 120)
|
|
|
|
+ @ApiModelProperty("科组长评卷时间")
|
|
|
|
+ private Date headerTime;
|
|
|
|
+
|
|
@ApiModelProperty("科目信息")
|
|
@ApiModelProperty("科目信息")
|
|
private ExamSubject subject;
|
|
private ExamSubject subject;
|
|
|
|
|
|
@@ -327,6 +345,22 @@ public class MarkLibraryVo {
|
|
this.subject = subject;
|
|
this.subject = subject;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public String getStatusText() {
|
|
|
|
+ return statusText;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setStatusText(String statusText) {
|
|
|
|
+ this.statusText = statusText;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public String getMarkerScoreText() {
|
|
|
|
+ return markerScoreText;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setMarkerScoreText(String markerScoreText) {
|
|
|
|
+ this.markerScoreText = markerScoreText;
|
|
|
|
+ }
|
|
|
|
+
|
|
public static MarkLibraryVo of(MarkLibrary from) {
|
|
public static MarkLibraryVo of(MarkLibrary from) {
|
|
if (from == null) {
|
|
if (from == null) {
|
|
return null;
|
|
return null;
|
|
@@ -356,6 +390,14 @@ public class MarkLibraryVo {
|
|
ret.setTitle(from.getTitle());
|
|
ret.setTitle(from.getTitle());
|
|
ret.setHeaderLoginName(from.getHeaderLoginName());
|
|
ret.setHeaderLoginName(from.getHeaderLoginName());
|
|
ret.setSubject(from.getSubject());
|
|
ret.setSubject(from.getSubject());
|
|
|
|
+ ret.setStatusText(from.getStatus() == null ? null : from.getStatus().getName());
|
|
|
|
+ if (from.getMarkerScore() != null) {
|
|
|
|
+ if (from.getMarkerScore() == -1) {
|
|
|
|
+ ret.setMarkerScoreText("未选做");
|
|
|
|
+ } else {
|
|
|
|
+ ret.setMarkerScoreText(from.getMarkerScore() + "");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|