From b0625931bc528429d592f642bdd759e7dbdfb1c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 19 Oct 2021 22:21:07 +0800
Subject: [PATCH] 1.保安员新增接口修改，单个新增保安员默认密码为身份证号后6位，账号为身份证号， 2.考试成绩可以按天导出 3.个人图片批量导入接口修改 4.保安员批量导入修改，如有重复的账号导入的跳过，导入完成后返回提示信息

---
 src/main/java/org/springblade/modules/exam/vo/ExamScoreVO.java |   43 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 41 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..0045c83 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,36 @@
 	 * 考勤提交的结果
 	 */
 	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;
+
 }

--
Gitblit v1.9.3