From f0e2074cb81056813fe8b34aa6b7d8a2419e1bdf Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 11 Nov 2021 20:49:06 +0800
Subject: [PATCH] 新增制证审核

---
 src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java |   65 +++++++++++++++++++++++++++++++-
 1 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java b/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
index 3ead552..4956852 100644
--- a/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
+++ b/src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java
@@ -1,10 +1,12 @@
 package org.springblade.modules.exam.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springblade.modules.exam.entity.ExamScore;
-import org.springblade.modules.exam.entity.ExamSubjectOption;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,7 +19,12 @@
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 试卷id
+	 * 公司名称
+	 */
+	private String companyName;
+
+	/**
+	 * 考试id,提交成绩时用
 	 */
 	private Long papersId;
 
@@ -25,4 +32,58 @@
 	 * 考勤提交的结果
 	 */
 	private List<ExamResultVO> examResultVOS;
+
+	/**
+	 * 考试类型
+	 */
+	private Integer examType;
+
+
+	/**
+	 * 是否考试  1：否  2：是，考试结束  3:考试中
+	 */
+	private Integer isExam;
+
+	/**
+	 * 用户名
+	 */
+	private String account;
+
+	/**
+	 * 部门id
+	 */
+	private Long deptId;
+
+	/**
+	 * 培训公司id
+	 */
+	private Long trainUnitId;
+
+	/**
+	 * 考试时间
+	 */
+	private String examDate;
+
+	/**
+	 * 性别
+	 */
+	private String sex;
+
+	/**
+	 * 发证时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date paperTime;
+
+	/**
+	 * 保安证编号
+	 */
+	private String securityNumber;
+
+	/**
+	 * 头像
+	 */
+	private String avatar;
+
 }

--
Gitblit v1.9.3