format code style

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/AsyncExportService.java

@@ -16,19 +16,20 @@ import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentQ
  */
 public interface AsyncExportService {
 
-    void exportExamRecordDetails(String jsonParams,User user);
+    void exportExamRecordDetails(String jsonParams, User user);
 
-    void exportExamScoreStatistics(String jsonParams,User user);
-    
-    void exportExamScheduling(String jsonParams,User user);
+    void exportExamScoreStatistics(String jsonParams, User user);
+
+    void exportExamScheduling(String jsonParams, User user);
 
     void exportExamAuditList(String query, User user);
 
-	void asyncExportExamScheduling(Long taskId, ExamStudentQuery req);
+    void asyncExportExamScheduling(Long taskId, ExamStudentQuery req);
 
-	void asyncExportExamRecordDetails(Long taskId, ExamRecordQuery req);
+    void asyncExportExamRecordDetails(Long taskId, ExamRecordQuery req);
 
-	void asyncExportExamScoreStatistics(Long taskId, ExamScoreQuery req);
+    void asyncExportExamScoreStatistics(Long taskId, ExamScoreQuery req);
 
     void asyncExportExamAuditList(Long taskId, ExamAuditQuery query);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamAuditService.java

@@ -7,16 +7,14 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
+import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamAuditEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.DisciplineType;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.RedoAuditInfo;
-import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
 
 /**
  * 考试记录审核相关接口
@@ -95,4 +93,5 @@ public interface ExamAuditService {
     void saveExamAuditByNoPhoto(Long examRecordDataId);
 
     void saveHeaderWarnAudit(Long realExamRecordDataId);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamBossService.java

@@ -11,7 +11,6 @@ import cn.com.qmth.examcloud.support.examing.ExamBoss;
 public interface ExamBossService {
 
     /**
-     *
      * @param examStudentId
      * @param eb
      */
@@ -19,6 +18,7 @@ public interface ExamBossService {
 
     /**
      * 获取
+     *
      * @param examStudentId
      * @return
      */
@@ -26,7 +26,9 @@ public interface ExamBossService {
 
     /**
      * 删除
+     *
      * @param examStudentId
      */
     public void deleteExamBoss(Long examStudentId);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamCaptureService.java

@@ -38,6 +38,7 @@ public interface ExamCaptureService {
 
     /**
      * 获取虚拟摄像头名称
+     *
      * @param examRecordDataId
      * @return
      */

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamRecordDataCacheService.java

@@ -1,9 +1,5 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentBean;
-import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.support.examing.ExamRecordData;
 
 /**
@@ -13,6 +9,7 @@ import cn.com.qmth.examcloud.support.examing.ExamRecordData;
  * @Version 1.0
  */
 public interface ExamRecordDataCacheService {
+
     /**
      * 保存考试记录
      *

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamRecordDataService.java

@@ -28,8 +28,8 @@ public interface ExamRecordDataService {
                                                      String basePaperId,
                                                      String paperStructId, Boolean fullyObjective);
 
-	Long getGetAwaitingAuditCount(Long rootOrgId, Long examId);
+    Long getGetAwaitingAuditCount(Long rootOrgId, Long examId);
 
-	CheckPaperInExamResp checkPaperInExam(CheckPaperInExamReq req);
+    CheckPaperInExamResp checkPaperInExam(CheckPaperInExamReq req);
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamRecordForMarkingService.java

@@ -1,58 +1,61 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import java.util.List;
-
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordForMarkingEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordDataBean;
 
+import java.util.List;
+
 /**
- *
- * @author  	chenken
- * @date    	2018年9月17日 下午3:57:58
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年9月17日 下午3:57:58
+ * @company QMTH
  * @description ExamRecordForMarkingService.java
  */
 public interface ExamRecordForMarkingService {
 
-	/**
-	 * 获取 有效考试记录
-	 */
-	List<ExamRecordForMarkingEntity> queryValidExamRecordList(Long examId, Long courseId);
-
-	/**
-	 * 根据条件查询阅卷需要的信息
-	 * @param id
-	 * @param examId
-	 * @param courseId
-	 * @param batchNum
-	 * @return
-	 */
-	List<ExamRecordForMarkingEntity> findExamRecordForMarkingInfo(Long id, Long examId, Long courseId,String batchNum);
-
-	List<ExamRecordForMarkingEntity> queryValidExamRecordInfoByStuIds(Long examId, Long courseId,
-			List<Long> examStudentIds,String batchNum);
-
-	/**
+    /**
+     * 获取 有效考试记录
+     */
+    List<ExamRecordForMarkingEntity> queryValidExamRecordList(Long examId, Long courseId);
+
+    /**
+     * 根据条件查询阅卷需要的信息
+     *
+     * @param id
+     * @param examId
+     * @param courseId
+     * @param batchNum
+     * @return
+     */
+    List<ExamRecordForMarkingEntity> findExamRecordForMarkingInfo(Long id, Long examId, Long courseId, String batchNum);
+
+    List<ExamRecordForMarkingEntity> queryValidExamRecordInfoByStuIds(Long examId, Long courseId,
+                                                                      List<Long> examStudentIds, String batchNum);
+
+    /**
      * 离线考试-保存阅卷相关数据-对内
+     *
      * @param examRecordData
      * @param fileName
      * @param fileUrl
      */
-	void saveOffLineExamRecordForMarking(ExamRecordDataBean examRecordData, String fileName, String fileUrl);
-
-	void saveOffLineExamRecordForMarking(ExamRecordDataBean examRecordData);
-
-	/**
-	 * 在线考试-保存阅卷相关数据-对内
-	 * @param examRecordDataId
-	 */
-	void saveExamRecordForMarking(Long examRecordDataId,Double objectiveScore);
-
-	/**
-	 * 获取某个考生的有效考试记录
-	 * @param examStudentId 考生id集合
-	 * @return
-	 */
-	List<ExamRecordForMarkingEntity> queryValidExamRecordList(Long examStudentId);
+    void saveOffLineExamRecordForMarking(ExamRecordDataBean examRecordData, String fileName, String fileUrl);
+
+    void saveOffLineExamRecordForMarking(ExamRecordDataBean examRecordData);
+
+    /**
+     * 在线考试-保存阅卷相关数据-对内
+     *
+     * @param examRecordDataId
+     */
+    void saveExamRecordForMarking(Long examRecordDataId, Double objectiveScore);
+
+    /**
+     * 获取某个考生的有效考试记录
+     *
+     * @param examStudentId 考生id集合
+     * @return
+     */
+    List<ExamRecordForMarkingEntity> queryValidExamRecordList(Long examStudentId);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamRecordPaperStructService.java

@@ -4,11 +4,12 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordPaperStructEntit
 
 public interface ExamRecordPaperStructService {
 
-	/**
-	 * 根据examRecordDataId查询考试记录试卷结构
-	 * @param examRecordDataId
-	 * @return
-	 */
-	public ExamRecordPaperStructEntity getExamRecordPaperStruct(Long examRecordDataId);
-	
+    /**
+     * 根据examRecordDataId查询考试记录试卷结构
+     *
+     * @param examRecordDataId
+     * @return
+     */
+    public ExamRecordPaperStructEntity getExamRecordPaperStruct(Long examRecordDataId);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamRecordQuestionsService.java

@@ -1,55 +1,60 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamQuestionEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.ExamStudentQuestionInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.SubjectiveQuestionScoreInfo;
 import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
 
+import java.util.List;
+
 public interface ExamRecordQuestionsService {
 
-	/**
-	 * 获取考生主观题答案
-	 * @param examRecordDataId	考试记录ID
-	 * @return
-	 */
-	List<ExamQuestionEntity> querySubjectiveAnswerList(Long examRecordDataId);
-	
-	/**
-	 * 保存主观题得分
-	 * @param subjectiveQuestionScoreInfoList
-	 */
-	void saveSubjectiveQuestionScore(Long examRecordDataId, List<SubjectiveQuestionScoreInfo> subjectiveQuestionScoreInfoList);
-
-	/**
-	 * 计算主观题作答总长度
-	 * @param examRecordDataId
-	 * @return
-	 */
-	Integer calculationSubjectiveAnswerLength(Long examRecordDataId);
-
-	/**
-	 * 初始化ExamQuestion
-	 * @param examRecordDataId
-	 * @param paperStructByReorder
-	 */
-	ExamRecordQuestionsEntity createExamRecordQuestions(Long examRecordDataId, DefaultPaper paperStructByReorder);
-
-	/**
-	 * 获取考试作答记录并修复考试记录表的数据(如有必要)
-	 * @param examRecordData 考试记录
-	 * @return
-	 */
-	ExamRecordQuestionsEntity getExamRecordQuestionsAndFixExamRecordDataIfNecessary(ExamRecordDataEntity examRecordData);
-
-	/**
-	 *  获取考试作答记录并修复考试记录表的数据(如有必要)
-	 * @param examRecordDataId 考试记录id
-	 * @return
-	 */
-	ExamRecordQuestionsEntity getExamRecordQuestionsAndFixExamRecordDataIfNecessary(Long examRecordDataId);
+    /**
+     * 获取考生主观题答案
+     *
+     * @param examRecordDataId 考试记录ID
+     * @return
+     */
+    List<ExamQuestionEntity> querySubjectiveAnswerList(Long examRecordDataId);
+
+    /**
+     * 保存主观题得分
+     *
+     * @param subjectiveQuestionScoreInfoList
+     */
+    void saveSubjectiveQuestionScore(Long examRecordDataId, List<SubjectiveQuestionScoreInfo> subjectiveQuestionScoreInfoList);
+
+    /**
+     * 计算主观题作答总长度
+     *
+     * @param examRecordDataId
+     * @return
+     */
+    Integer calculationSubjectiveAnswerLength(Long examRecordDataId);
+
+    /**
+     * 初始化ExamQuestion
+     *
+     * @param examRecordDataId
+     * @param paperStructByReorder
+     */
+    ExamRecordQuestionsEntity createExamRecordQuestions(Long examRecordDataId, DefaultPaper paperStructByReorder);
+
+    /**
+     * 获取考试作答记录并修复考试记录表的数据(如有必要)
+     *
+     * @param examRecordData 考试记录
+     * @return
+     */
+    ExamRecordQuestionsEntity getExamRecordQuestionsAndFixExamRecordDataIfNecessary(ExamRecordDataEntity examRecordData);
+
+    /**
+     * 获取考试作答记录并修复考试记录表的数据(如有必要)
+     *
+     * @param examRecordDataId 考试记录id
+     * @return
+     */
+    ExamRecordQuestionsEntity getExamRecordQuestionsAndFixExamRecordDataIfNecessary(Long examRecordDataId);
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamRecordService.java

@@ -12,7 +12,6 @@ import cn.com.qmth.examcloud.core.oe.admin.service.bean.ExamStudentEffectiveScor
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamStudentQuestionScoreInfo;
-
 import org.springframework.data.domain.Page;
 
 import java.util.List;
@@ -57,15 +56,15 @@ public interface ExamRecordService {
      */
     List<ExamRecordInfo> getExamRecordWaitingAudit(ExamRecordQuery query);
 
-	/**
-	 * Description 查询“监考待审”下一条记录
-	 *
-	 * @param query
-	 * @param examRecordDataId
-	 * @param next
-	 * @return java.lang.Long
-	 */
-	Long getExamRecordWaitingAuditNextId(ExamRecordQuery query, Long examRecordDataId, String next);
+    /**
+     * Description 查询“监考待审”下一条记录
+     *
+     * @param query
+     * @param examRecordDataId
+     * @param next
+     * @return java.lang.Long
+     */
+    Long getExamRecordWaitingAuditNextId(ExamRecordQuery query, Long examRecordDataId, String next);
 
     /**
      * 获取正在考试的考生ID列表
@@ -85,35 +84,40 @@ public interface ExamRecordService {
 
     /**
      * 查询“考试明细” 是否存在待审数据
+     *
      * @param query
      * @return
      */
-	Long existsWarnExamRecordDetail(ExamRecordQuery query);
-	
-	/**
-	 * 根据条件查询 “考试明细”
-	 * @param newQuery
-	 * @return
-	 */
-	List<ExamRecordInfo> getExamRecordDetailList(ExamRecordQuery newQuery);
-
-	/**
-	 * 根据考试id和课程代码获取学生作答成绩
-	 * @param examId
-	 * @param courseCode
-	 * @return
-	 */
-	List<ExamStudentQuestionScoreInfo> getExamStudentQuestionScoreList(Long examId, String courseCode);
+    Long existsWarnExamRecordDetail(ExamRecordQuery query);
+
+    /**
+     * 根据条件查询 “考试明细”
+     *
+     * @param newQuery
+     * @return
+     */
+    List<ExamRecordInfo> getExamRecordDetailList(ExamRecordQuery newQuery);
+
+    /**
+     * 根据考试id和课程代码获取学生作答成绩
+     *
+     * @param examId
+     * @param courseCode
+     * @return
+     */
+    List<ExamStudentQuestionScoreInfo> getExamStudentQuestionScoreList(Long examId, String courseCode);
 
     /**
      * 获取考生的最终有效成绩
+     *
      * @param markingType
      * @param examStudentIdList
      * @return
      */
     List<ExamStudentEffectiveScoreInfo> getExamStudentEffectiveScoreList(String markingType, List<Long> examStudentIdList);
 
-	List<ExamRecordInfo> getExamRecordDetailListForAsync(ExamRecordQuery query);
+    List<ExamRecordInfo> getExamRecordDetailListForAsync(ExamRecordQuery query);
+
+    void refreshCaptureStatistic(Long examId);
 
-	void refreshCaptureStatistic(Long examId);
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScoreNoticeQueueService.java

@@ -1,24 +1,25 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreNoticeQueueEntity;
-
 /**
- * 
  * @author lideyin
  * @date 2019年3月11日 下午1:42:04
  * @description 发送成绩短信队列服务接口
  */
 public interface ExamScoreNoticeQueueService {
 
-	/**
-	 * 添加成绩通知队列
-	 * @param rootOrgId 顶级组织机构id
-	 */
-	public void addExamScoreNoticeQueue(Long rootOrgId);
-	/**
-	 * 当前机构是否存在通知队列
-	 * @param rootOrgId 顶级组织机构id
-	 * @return
-	 */
-	public boolean isExistExamScoreNoticeQueue(Long rootOrgId);
+    /**
+     * 添加成绩通知队列
+     *
+     * @param rootOrgId 顶级组织机构id
+     */
+    public void addExamScoreNoticeQueue(Long rootOrgId);
+
+    /**
+     * 当前机构是否存在通知队列
+     *
+     * @param rootOrgId 顶级组织机构id
+     * @return
+     */
+    public boolean isExistExamScoreNoticeQueue(Long rootOrgId);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScoreObtainQueueService.java

@@ -1,35 +1,35 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import javax.validation.constraints.NotNull;
-
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.NotifyUrlInfo;
 
+import javax.validation.constraints.NotNull;
+
 /**
- * 
- * @author  	chenken
- * @date    	2018年11月27日 下午2:21:40
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年11月27日 下午2:21:40
+ * @company QMTH
  * @description 成绩获取队列接口
  */
 public interface ExamScoreObtainQueueService {
 
-	/**
-	 * 保存获取成绩队列，并发送通知
-	 * @param examRecordDataId
-	 */
-	void saveExamScoreObtainQueue(Long examRecordDataId);
-	
-	/**
-	 * 发送获取分数通知
-	 */
-	void sendObtainScoreNotify(Long rootOrgId);
+    /**
+     * 保存获取成绩队列，并发送通知
+     *
+     * @param examRecordDataId
+     */
+    void saveExamScoreObtainQueue(Long examRecordDataId);
+
+    /**
+     * 发送获取分数通知
+     */
+    void sendObtainScoreNotify(Long rootOrgId);
+
+    /**
+     * 根据组织机构id获取通知路径相关信息
+     *
+     * @param rootOrgId 组织机构id
+     * @return
+     */
+    @NotNull NotifyUrlInfo getNotifyUrlInfo(Long rootOrgId);
 
-	/**
-	 * 根据组织机构id获取通知路径相关信息
-	 * @param rootOrgId 组织机构id
-	 * @return
-	 */
-	@NotNull NotifyUrlInfo getNotifyUrlInfo(Long rootOrgId);
-	
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScorePushQueueService.java

@@ -1,23 +1,18 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-
-
-
-
 /**
- * 
- * @author  	chenken
- * @date    	2018年9月8日 上午10:45:36
- * @company 	QMTH
- * @description 分数推送队列服务接口 
+ * @author chenken
+ * @date 2018年9月8日 上午10:45:36
+ * @company QMTH
+ * @description 分数推送队列服务接口
  */
 public interface ExamScorePushQueueService {
 
-	/**
-	 * 保存分数推送数据
-	 * @param examRecordDataId
-	 */
-	void saveScoreDataInfoToQueue(Long examRecordDataId,Long examScoreId);
-	
+    /**
+     * 保存分数推送数据
+     *
+     * @param examRecordDataId
+     */
+    void saveScoreDataInfoToQueue(Long examRecordDataId, Long examScoreId);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScorePushService.java

@@ -3,21 +3,20 @@ package cn.com.qmth.examcloud.core.oe.admin.service;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
 
 
-
 /**
- * 
- * @author  	chenken
- * @date    	2018年9月8日 上午11:16:50
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年9月8日 上午11:16:50
+ * @company QMTH
  * @description 推送分数接口
  */
 public interface ExamScorePushService {
 
-	/**
-	 * 机构推送成绩逻辑
-	 * @param examScorePushQueue
-	 * @throws Exception
-	 */
-	public void scorePush(ExamScorePushQueue examScorePushQueue);
-	
+    /**
+     * 机构推送成绩逻辑
+     *
+     * @param examScorePushQueue
+     * @throws Exception
+     */
+    public void scorePush(ExamScorePushQueue examScorePushQueue);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScoreQueueService.java

@@ -4,26 +4,23 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
 
 
-
-
 /**
- * 
- * @author  	chenken
- * @date    	2018年9月8日 上午10:45:36
- * @company 	QMTH
- * @description 分数推送队列服务接口 
+ * @author chenken
+ * @date 2018年9月8日 上午10:45:36
+ * @company QMTH
+ * @description 分数推送队列服务接口
  */
 public interface ExamScoreQueueService {
-	
-	/**
-	 * 处理推分队列
-	 */
-	public void disposeScoreQueue();
-	
-	/**
-	 * 
-	 * @param errorMsg
-	 * @param examScorePushQueue
-	 */
-	public void saveExamScorePushQueue(String returnMsg,ExamScorePushQueue examScorePushQueue,ExamScoreQueueStatus examScoreQueueStatus);
+
+    /**
+     * 处理推分队列
+     */
+    public void disposeScoreQueue();
+
+    /**
+     * @param errorMsg
+     * @param examScorePushQueue
+     */
+    public void saveExamScorePushQueue(String returnMsg, ExamScorePushQueue examScorePushQueue, ExamScoreQueueStatus examScoreQueueStatus);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamScoreService.java

@@ -7,14 +7,13 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import java.util.List;
-
-import org.springframework.data.domain.Page;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ObjectiveScoreInfo;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
 
 /**
  * 考试分数相关接口
@@ -30,27 +29,31 @@ public interface ExamScoreService {
 
     /**
      * 获取所有的考试分数集合
-     * @param examId 考试id
+     *
+     * @param examId         考试id
      * @param identityNumber 身份证号
-     * @param courseId 课程代码
+     * @param courseId       课程代码
      * @return ExamScoreEntity
      */
     List<ExamScoreEntity> getAllExamScoreList(Long examId, String identityNumber, Long courseId);
 
     /**
      * 离线考试初始化得分
+     *
      * @param examRecordDataId
      */
     public void createExamScoreWithOffline(Long examRecordDataId);
-    
-    
+
+
     /**
-     * 使用考生ID查询客观分信息 
+     * 使用考生ID查询客观分信息
      * 客观分是指考生完成过一次考试后，有效的客观分，
      * 如此条考试记录需要监考审核则显示为"待审"，客观分显示时，展示次数(第几次考试)、开始时间、交卷时间，客观分；
+     *
      * @return
      */
     public List<ObjectiveScoreInfo> queryObjectiveScoreList(Long examStudentId);
 
-	List<ExamScoreInfo> exportExamScoreListForAsync(ExamScoreQuery query);
+    List<ExamScoreInfo> exportExamScoreListForAsync(ExamScoreQuery query);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamStudentFinalScoreService.java

@@ -9,7 +9,9 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentFinalScoreEntit
  * @Version 1.0
  */
 public interface ExamStudentFinalScoreService {
+
     ExamStudentFinalScoreEntity calcAndSaveFinalScore(Long examStudentId);
 
     ExamStudentFinalScoreEntity getFinalEffectiveExamScore(Long examStudentId);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExamStudentService.java

@@ -7,18 +7,12 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.OnHandExamInfo;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.*;
 import org.springframework.data.domain.Page;
 
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.OnHandExamInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.CourseProgressInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentFinishedStatistic;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentOrgStatistic;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentPartInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentQuery;
+import java.util.List;
 
 /**
  * 考生信息接口
@@ -77,7 +71,7 @@ public interface ExamStudentService {
      * @param examId
      * @return
      */
-    ExamStudentFinishedStatistic getExamStudentStatisticByFinished(Long examId,Long examStageId);
+    ExamStudentFinishedStatistic getExamStudentStatisticByFinished(Long examId, Long examStageId);
 
     /**
      * 考试概况-按学习中心统计
@@ -87,7 +81,7 @@ public interface ExamStudentService {
      * @param examStageId
      * @return
      */
-    List<ExamStudentOrgStatistic> getExamStudentStatisticByOrg(Long examId,Long examStageId, Long orgId);
+    List<ExamStudentOrgStatistic> getExamStudentStatisticByOrg(Long examId, Long examStageId, Long orgId);
 
     /**
      * 获取考生信息
@@ -99,6 +93,7 @@ public interface ExamStudentService {
 
     /**
      * 判断考生是否启用
+     *
      * @param examStudentId
      * @return
      */
@@ -111,7 +106,7 @@ public interface ExamStudentService {
      * @param orgId
      * @return
      */
-    List<Long> findCoursesFromExamStudent(Long examId,Long examStageId, Long orgId);
+    List<Long> findCoursesFromExamStudent(Long examId, Long examStageId, Long orgId);
 
     /**
      * 设置重考
@@ -128,7 +123,7 @@ public interface ExamStudentService {
      * @param examId
      * @param courseId
      */
-    public List<CourseProgressInfo> queryCourseProgressInfos(Long examId,Long examStageId, Long courseId, String orderColumn);
+    public List<CourseProgressInfo> queryCourseProgressInfos(Long examId, Long examStageId, Long courseId, String orderColumn);
 
     /**
      * @return java.util.List<cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo>
@@ -151,4 +146,5 @@ public interface ExamStudentService {
     List<ExamStudentInfo> getExamStudentInfoListForAsync(ExamStudentQuery query);
 
     List<OnHandExamInfo> queryOnlineExamEndList(Long userId, ExamType online);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/ExportTaskService.java

@@ -28,14 +28,14 @@ public interface ExportTaskService {
 
     boolean existUnFinishTask(ExportTaskType type, Long rootOrgId, Long examId);
 
-    Page<ExportTaskListResp> getExportTaskList(ExportTaskListReq req,Long userId);
+    Page<ExportTaskListResp> getExportTaskList(ExportTaskListReq req, Long userId);
 
-	ExportTaskEntity findExportTaskToDispose();
+    ExportTaskEntity findExportTaskToDispose();
 
-	void updateExportTaskStatus(Long taskId, ExportTaskStatus status);
+    void updateExportTaskStatus(Long taskId, ExportTaskStatus status);
 
-	void startExportTask(Long taskId);
+    void startExportTask(Long taskId);
 
-	void endExportTask(Long taskId);
+    void endExportTask(Long taskId);
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/GainBaseDataService.java

@@ -1,59 +1,61 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
-import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.StudentBean;
-import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
 
 /**
- * 
- * @author  	chenken
- * @date    	2018年10月17日 下午2:28:30
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年10月17日 下午2:28:30
+ * @company QMTH
  * @description 获取基础数据接口
  */
 public interface GainBaseDataService {
 
-	/**
-	 * 获取课程 
-	 * @param courseId
-	 * @param rootOrgId
-	 * @return
-	 */
-	public CourseBean getCourseBean(Long courseId,Long rootOrgId);
-
-	CourseBean getCourseBean(String courseCode, Long rootOrgId);
-
-	/**
-	 * 获取机构
-	 * @param orgId
-	 * @return
-	 */
-	public OrgCacheBean getOrgBean(Long orgId);
-
-	/**
-	 * 获取学生
-	 * @param studentId
-	 * @return
-	 */
-	public StudentBean getStudentBean(Long studentId);
-
-	StudentBean getStudentBean(String studentCode,Long rootOrgId);
-
-	/**
-	 * 获取考生
-	 * @param examStudentId
-	 * @return
-	 */
-	public ExamStudentBean getExamStudentBean(Long examStudentId);
-	
-	/**
-	 * 获取系统设置
-	 * @param key
-	 * @return
-	 */
-	public String getSysConfig(String key);
-	
+    /**
+     * 获取课程
+     *
+     * @param courseId
+     * @param rootOrgId
+     * @return
+     */
+    public CourseBean getCourseBean(Long courseId, Long rootOrgId);
+
+    CourseBean getCourseBean(String courseCode, Long rootOrgId);
+
+    /**
+     * 获取机构
+     *
+     * @param orgId
+     * @return
+     */
+    public OrgCacheBean getOrgBean(Long orgId);
+
+    /**
+     * 获取学生
+     *
+     * @param studentId
+     * @return
+     */
+    public StudentBean getStudentBean(Long studentId);
+
+    StudentBean getStudentBean(String studentCode, Long rootOrgId);
+
+    /**
+     * 获取考生
+     *
+     * @param examStudentId
+     * @return
+     */
+    public ExamStudentBean getExamStudentBean(Long examStudentId);
+
+    /**
+     * 获取系统设置
+     *
+     * @param key
+     * @return
+     */
+    public String getSysConfig(String key);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/IllegallyTypeService.java

@@ -20,22 +20,22 @@ public interface IllegallyTypeService {
     List<IllegallyTypeEntity> getSystemIllegallyTypes();
 
     /**
-	 * 方法注释
-	 *
-	 * @author WANGWEI
-	 * @param info
-	 * @return
-	 */
-	IllegallyTypeEntity saveIllegallyType(IllegallyTypeInfo info);
-
-	/**
-	 * 导入专业
-	 *
-	 * @author WANGWEI
-	 * @param rootOrgId
-	 * @param file
-	 * @return
-	 */
-	List<Map<String, Object>> importIllegallyType(Long rootOrgId, File file);
+     * 方法注释
+     *
+     * @param info
+     * @return
+     * @author WANGWEI
+     */
+    IllegallyTypeEntity saveIllegallyType(IllegallyTypeInfo info);
+
+    /**
+     * 导入专业
+     *
+     * @param rootOrgId
+     * @param file
+     * @return
+     * @author WANGWEI
+     */
+    List<Map<String, Object>> importIllegallyType(Long rootOrgId, File file);
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/LocalCacheService.java

@@ -1,27 +1,29 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import java.util.Map;
-
-import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
-import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 
+import java.util.Map;
+
 /**
  * 本地缓存服务
- * @author chenken
  *
+ * @author chenken
  */
 public interface LocalCacheService {
-	/**
-	 * 获取学生电话
-	 * @param studentId
-	 * @return
-	 */
-	public String getStudentPhotoNumber(Map<String, Object> cahcheMap, Long studentId);
-	
-	/**
-	 * 获取考生
-	 * @return
-	 */
-	public ExamStudentBean getExamStudentBean(Map<String, Object> cahcheMap,Long examStudentId);
+
+    /**
+     * 获取学生电话
+     *
+     * @param studentId
+     * @return
+     */
+    public String getStudentPhotoNumber(Map<String, Object> cahcheMap, Long studentId);
+
+    /**
+     * 获取考生
+     *
+     * @return
+     */
+    public ExamStudentBean getExamStudentBean(Map<String, Object> cahcheMap, Long examStudentId);
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/OfflineExamService.java

@@ -1,50 +1,53 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.OfflineExamCourseInfo;
+
 import java.io.File;
 import java.util.List;
 
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.OfflineExamCourseInfo;
-
 
 /**
- *
- * @author  	chenken
- * @date    	2018年9月5日 上午10:35:18
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年9月5日 上午10:35:18
+ * @company QMTH
  * @description 离线考试服务接口
  */
 public interface OfflineExamService {
 
-	/**
-	 * 获取待考课程列表
-	 * @param studentId
-	 * @return
-	 */
-	List<OfflineExamCourseInfo> getOfflineCourse(Long studentId);
-
-	/**
-	 * 开始离线考试
-	 * @param token
-	 * @param examStudentId
-	 * @param studentId
-	 * @return
-	 */
-	void startOfflineExam(Long examStudentId);
-
-	/**
-	 * 上传作答
-	 * @param examRecordDataId
-	 * @param tempFile
-	 * @param fileType
-	 */
-	void submitPaper(Long examRecordDataId, File tempFile,String fileType)  throws Exception;
-
-	/**
-	 * 上传作答
-	 * @param examRecordDataId 考试记录id
-	 * @param tempFiles 文件集合
-	 * @param fileType 文件类型
-	 */
-	void batchSubmitPaper(Long examRecordDataId,List<File> tempFiles,String fileType)  throws Exception;
+    /**
+     * 获取待考课程列表
+     *
+     * @param studentId
+     * @return
+     */
+    List<OfflineExamCourseInfo> getOfflineCourse(Long studentId);
+
+    /**
+     * 开始离线考试
+     *
+     * @param token
+     * @param examStudentId
+     * @param studentId
+     * @return
+     */
+    void startOfflineExam(Long examStudentId);
+
+    /**
+     * 上传作答
+     *
+     * @param examRecordDataId
+     * @param tempFile
+     * @param fileType
+     */
+    void submitPaper(Long examRecordDataId, File tempFile, String fileType) throws Exception;
+
+    /**
+     * 上传作答
+     *
+     * @param examRecordDataId 考试记录id
+     * @param tempFiles        文件集合
+     * @param fileType         文件类型
+     */
+    void batchSubmitPaper(Long examRecordDataId, List<File> tempFiles, String fileType) throws Exception;
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/PracticeService.java

@@ -1,39 +1,41 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.PracticeCourseInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.PracticeDetailInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.PracticeRecordInfo;
 
+import java.util.List;
+
 /**
- * 
- * @author  	chenken
- * @date    	2018年9月7日 上午11:04:59
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年9月7日 上午11:04:59
+ * @company QMTH
  * @description PracticeService.java
  */
 public interface PracticeService {
 
-	/**
-	 * 练习课程列表
-	 * @param examId
-	 * @param studentId
-	 * @return
-	 */
-	List<PracticeCourseInfo> queryPracticeCourseList(Long examId, Long studentId);
-	
-	/**
-	 * 课程练习记录详情
-	 * @param examStudentId
-	 * @return
-	 */
-	List<PracticeRecordInfo> queryPracticeRecordList(Long examStudentId);
-	
-	/**
-	 * 单次练习答题情况统计
-	 * @return
-	 */
-	PracticeDetailInfo getPracticeDetailInfo(Long examRecordDataId);
+    /**
+     * 练习课程列表
+     *
+     * @param examId
+     * @param studentId
+     * @return
+     */
+    List<PracticeCourseInfo> queryPracticeCourseList(Long examId, Long studentId);
+
+    /**
+     * 课程练习记录详情
+     *
+     * @param examStudentId
+     * @return
+     */
+    List<PracticeRecordInfo> queryPracticeRecordList(Long examStudentId);
+
+    /**
+     * 单次练习答题情况统计
+     *
+     * @return
+     */
+    PracticeDetailInfo getPracticeDetailInfo(Long examRecordDataId);
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/ExamProcessRecordInfo.java

@@ -9,6 +9,7 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @Version 1.0
  */
 public class ExamProcessRecordInfo implements JsonSerializable {
+
     private static final long serialVersionUID = 5667104330981650606L;
 
     /**
@@ -75,4 +76,5 @@ public class ExamProcessRecordInfo implements JsonSerializable {
     public void setSourceIp(String sourceIp) {
         this.sourceIp = sourceIp;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/ExamRecordQuestionsInfo.java

@@ -8,13 +8,13 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
 
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.NewQuestionType;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import cn.com.qmth.examcloud.core.oe.admin.base.utils.NewQuestionType;
-
 /**
  * 考试作答试题集合
  *
@@ -22,10 +22,15 @@ import cn.com.qmth.examcloud.core.oe.admin.base.utils.NewQuestionType;
  * @since: 2018/9/11
  */
 public class ExamRecordQuestionsInfo implements Serializable {
+
     private static final long serialVersionUID = -1688201571728312142L;
+
     private String id;
+
     private Long examRecordDataId;
+
     private Date creationTime;
+
     private List<ExamQuestionEntity> examQuestionEntities;
 
     public void addExamQuestion(ExamQuestionEntity examQuestion) {
@@ -72,47 +77,57 @@ public class ExamRecordQuestionsInfo implements Serializable {
     }
 
     public static class ExamQuestionEntity {
+
         /**
          * 大题号
          */
         private Integer mainNumber;
+
         /**
          * 原题ID
          */
         private String questionId;
+
         /**
          * 顺序
          */
         private Integer order;
+
         /**
          * 小题分数
          */
         private Float questionScore;
+
         /**
          * 小题类型
          */
         private NewQuestionType questionType;
+
         /**
          * 标准答案
          */
         private String correctAnswer;
+
         /**
          * 考生作答
          */
         private String studentAnswer;
+
         /**
          * 学生小题得分
          */
         private Float studentScore;
+
         /**
          * 是否作答
          */
         private Boolean isAnswer;
+
         /**
          * 是否标记
          */
         private Boolean isSign;
-        
+
         private Integer[] optionPermutation;
 
         public Integer getMainNumber() {
@@ -195,14 +210,14 @@ public class ExamRecordQuestionsInfo implements Serializable {
             this.isSign = sign;
         }
 
-		public Integer[] getOptionPermutation() {
-			return optionPermutation;
-		}
+        public Integer[] getOptionPermutation() {
+            return optionPermutation;
+        }
+
+        public void setOptionPermutation(Integer[] optionPermutation) {
+            this.optionPermutation = optionPermutation;
+        }
 
-		public void setOptionPermutation(Integer[] optionPermutation) {
-			this.optionPermutation = optionPermutation;
-		}
-        
     }
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/ExamStudentEffectiveScoreInfo.java

@@ -16,7 +16,9 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @Version 1.0
  */
 public class ExamStudentEffectiveScoreInfo implements JsonSerializable {
+
     private static final long serialVersionUID = -8096091096954899775L;
+
     private Long examStudentId;
 
     private Long rootOrgId;
@@ -38,6 +40,7 @@ public class ExamStudentEffectiveScoreInfo implements JsonSerializable {
      * 试卷得分
      */
     private Double score;
+
     /**
      * 考试记录id
      */
@@ -114,4 +117,5 @@ public class ExamStudentEffectiveScoreInfo implements JsonSerializable {
     public void setExamRecordDataId(Long examRecordDataId) {
         this.examRecordDataId = examRecordDataId;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/ExamStudentQuestionInfo.java

@@ -7,82 +7,82 @@ import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 
 /**
- * 
- * @author  	chenken
- * @date    	2018年9月25日 上午9:43:19
- * @company 	QMTH
- * @description 考生作答信息 
+ * @author chenken
+ * @date 2018年9月25日 上午9:43:19
+ * @company QMTH
+ * @description 考生作答信息
  */
 public class ExamStudentQuestionInfo implements JsonSerializable {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8080615797817377990L;
-
-	/**
-	 * 题目序号
-	 */
-	private Integer order;
-	
-	/**
-	 * 是否标记
-	 */
-	private Boolean isSign;
-	
-	/**
-	 * 考生作答
-	 */
-	private String studentAnswer;
-	
-	/**
-	 * 音频播放次数
-	 */
-	private String audioPlayTimes;
-	/**
-	 * 题目作答类型
-	 */
-	@Enumerated(EnumType.STRING)
-	private AnswerType answerType;
-
-	public Integer getOrder() {
-		return order;
-	}
-
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
-
-	public String getStudentAnswer() {
-		return studentAnswer;
-	}
-
-	public void setStudentAnswer(String studentAnswer) {
-		this.studentAnswer = studentAnswer;
-	}
-
-	public Boolean getIsSign() {
-		return isSign;
-	}
-
-	public void setIsSign(Boolean isSign) {
-		this.isSign = isSign;
-	}
-
-	public String getAudioPlayTimes() {
-		return audioPlayTimes;
-	}
-
-	public void setAudioPlayTimes(String audioPlayTimes) {
-		this.audioPlayTimes = audioPlayTimes;
-	}
-
-	public AnswerType getAnswerType() {
-		return answerType;
-	}
-
-	public void setAnswerType(AnswerType answerType) {
-		this.answerType = answerType;
-	}
-	
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 8080615797817377990L;
+
+    /**
+     * 题目序号
+     */
+    private Integer order;
+
+    /**
+     * 是否标记
+     */
+    private Boolean isSign;
+
+    /**
+     * 考生作答
+     */
+    private String studentAnswer;
+
+    /**
+     * 音频播放次数
+     */
+    private String audioPlayTimes;
+
+    /**
+     * 题目作答类型
+     */
+    @Enumerated(EnumType.STRING)
+    private AnswerType answerType;
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public String getStudentAnswer() {
+        return studentAnswer;
+    }
+
+    public void setStudentAnswer(String studentAnswer) {
+        this.studentAnswer = studentAnswer;
+    }
+
+    public Boolean getIsSign() {
+        return isSign;
+    }
+
+    public void setIsSign(Boolean isSign) {
+        this.isSign = isSign;
+    }
+
+    public String getAudioPlayTimes() {
+        return audioPlayTimes;
+    }
+
+    public void setAudioPlayTimes(String audioPlayTimes) {
+        this.audioPlayTimes = audioPlayTimes;
+    }
+
+    public AnswerType getAnswerType() {
+        return answerType;
+    }
+
+    public void setAnswerType(AnswerType answerType) {
+        this.answerType = answerType;
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/IllegallyTypeInfo.java

@@ -1,89 +1,85 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-import cn.com.qmth.examcloud.support.enums.DataCategory;
-
-import javax.persistence.Column;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 
 public class IllegallyTypeInfo implements JsonSerializable {
 
-	private static final long serialVersionUID = 239263456816448160L;
+    private static final long serialVersionUID = 239263456816448160L;
+
+    private Long id;
 
-	private Long id;
+    private String code;
 
-	private String code;
+    private String name;
 
-	private String name;
+    private Long rootOrgId;
 
-	private Long rootOrgId;
+    private Boolean enable;
 
-	private Boolean enable;
+    /**
+     * 排序号
+     */
+    private Integer sortNo;
 
-	/**
-	 * 排序号
-	 */
-	private Integer sortNo;
+    /**
+     * 数据分类
+     */
+    private String dataCategory;
 
-	/**
-	 * 数据分类
-	 */
-	private String dataCategory;
+    public Long getId() {
+        return id;
+    }
 
-	public Long getId() {
-		return id;
-	}
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-	public void setId(Long id) {
-		this.id = id;
-	}
+    public String getCode() {
+        return code;
+    }
 
-	public String getCode() {
-		return code;
-	}
+    public void setCode(String code) {
+        this.code = code;
+    }
 
-	public void setCode(String code) {
-		this.code = code;
-	}
+    public String getName() {
+        return name;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
 
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
 
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
+    public Boolean getEnable() {
+        return enable;
+    }
 
-	public Boolean getEnable() {
-		return enable;
-	}
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
 
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
+    public Integer getSortNo() {
+        return sortNo;
+    }
 
-	public Integer getSortNo() {
-		return sortNo;
-	}
+    public void setSortNo(Integer sortNo) {
+        this.sortNo = sortNo;
+    }
 
-	public void setSortNo(Integer sortNo) {
-		this.sortNo = sortNo;
-	}
+    public String getDataCategory() {
+        return dataCategory;
+    }
 
-	public String getDataCategory() {
-		return dataCategory;
-	}
+    public void setDataCategory(String dataCategory) {
+        this.dataCategory = dataCategory;
+    }
 
-	public void setDataCategory(String dataCategory) {
-		this.dataCategory = dataCategory;
-	}
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/NotifyUrlInfo.java

@@ -5,30 +5,38 @@ import cn.com.qmth.examcloud.commons.util.HttpMethod;
 
 /**
  * 自定义通知路径相关信息
+ *
  * @author lideyin
  * @date 2019年5月16日 下午5:54:59
  * @description
  */
-public class NotifyUrlInfo  implements JsonSerializable{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4804279990944267151L;
-	//发送通知的地址
-	private String notifyUrl;
-	//发关请求的方式(eg:post/get/put/delete)
-	private HttpMethod httpMethod;
-	public String getNotifyUrl() {
-		return notifyUrl;
-	}
-	public void setNotifyUrl(String notifyUrl) {
-		this.notifyUrl = notifyUrl;
-	}
-	public HttpMethod getHttpMethod() {
-		return httpMethod;
-	}
-	public void setHttpMethod(HttpMethod httpMethod) {
-		this.httpMethod = httpMethod;
-	}
-	
+public class NotifyUrlInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -4804279990944267151L;
+
+    //发送通知的地址
+    private String notifyUrl;
+
+    //发关请求的方式(eg:post/get/put/delete)
+    private HttpMethod httpMethod;
+
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
+    }
+
+    public HttpMethod getHttpMethod() {
+        return httpMethod;
+    }
+
+    public void setHttpMethod(HttpMethod httpMethod) {
+        this.httpMethod = httpMethod;
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/OfflineExamCourseInfo.java

@@ -1,195 +1,196 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordFileAnswerInfo;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordFileAnswerInfo;
-
 
 /**
  * 离线考试课程
- * @author ting.yin
  *
+ * @author ting.yin
  */
 public class OfflineExamCourseInfo implements Serializable {
 
-	private static final long serialVersionUID = 4102608764528925537L;
+    private static final long serialVersionUID = 4102608764528925537L;
+
+    private Long examId;
+
+    private String examName;
+
+    private String orgName;//学校名称
 
-	private Long examId;
+    private Long examStudentId;
 
-	private String examName;
+    private String courseName;
 
-	private String orgName;//学校名称
+    private String courseCode;
 
-	private Long examStudentId;
+    private String courseLevel;
 
-	private String courseName;
+    private String studentCode;
 
-	private String courseCode;
+    private String studentName;
 
-	private String courseLevel;
+    private Date startTime;// 考试时间范围开始时间
 
-	private String studentCode;
+    private Date endTime; // 考试时间范围结束时间
 
-	private String studentName;
+    private String specialtyName;
 
-	private Date startTime;// 考试时间范围开始时间
+    private Long examRecordDataId;
 
-	private Date endTime; // 考试时间范围结束时间
+    private ExamRecordStatus status;//用于判断是否上传
 
-	private String specialtyName;
+    private String paperId;
 
-	private Long examRecordDataId;
+    /**
+     * 是否有效
+     */
+    private Boolean isvalid;
 
-	private ExamRecordStatus status;//用于判断是否上传
+    /**
+     * 离线考试作答文件集合
+     */
+    private List<ExamRecordFileAnswerInfo> offlineFiles;
 
-	private String paperId;
+    public Long getExamId() {
+        return examId;
+    }
 
-	/**
-	 * 是否有效
-	 */
-	private Boolean isvalid;
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
 
-	/**
-	 * 离线考试作答文件集合
-	 */
-	private List<ExamRecordFileAnswerInfo> offlineFiles;
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
 
-	public Long getExamId() {
-		return examId;
-	}
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
 
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
+    public String getCourseName() {
+        return courseName;
+    }
 
-	public Long getExamStudentId() {
-		return examStudentId;
-	}
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
 
-	public void setExamStudentId(Long examStudentId) {
-		this.examStudentId = examStudentId;
-	}
+    public String getCourseCode() {
+        return courseCode;
+    }
 
-	public String getCourseName() {
-		return courseName;
-	}
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
 
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
+    public String getStudentCode() {
+        return studentCode;
+    }
 
-	public String getCourseCode() {
-		return courseCode;
-	}
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
 
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
+    public String getStudentName() {
+        return studentName;
+    }
 
-	public String getStudentCode() {
-		return studentCode;
-	}
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
 
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
+    public Date getStartTime() {
+        return startTime;
+    }
 
-	public String getStudentName() {
-		return studentName;
-	}
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
 
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
+    public Date getEndTime() {
+        return endTime;
+    }
 
-	public Date getStartTime() {
-		return startTime;
-	}
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
+    public String getExamName() {
+        return examName;
+    }
 
-	public Date getEndTime() {
-		return endTime;
-	}
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
 
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
+    public String getCourseLevel() {
+        return courseLevel;
+    }
 
-	public String getExamName() {
-		return examName;
-	}
+    public void setCourseLevel(String courseLevel) {
+        this.courseLevel = courseLevel;
+    }
 
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
+    public String getSpecialtyName() {
+        return specialtyName;
+    }
 
-	public String getCourseLevel() {
-		return courseLevel;
-	}
+    public void setSpecialtyName(String specialtyName) {
+        this.specialtyName = specialtyName;
+    }
 
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
 
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
 
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
+    public Boolean getIsvalid() {
+        return isvalid;
+    }
 
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
-
-	public Boolean getIsvalid() {
-		return isvalid;
-	}
+    public void setIsvalid(Boolean isvalid) {
+        this.isvalid = isvalid;
+    }
 
-	public void setIsvalid(Boolean isvalid) {
-		this.isvalid = isvalid;
-	}
+    public String getPaperId() {
+        return paperId;
+    }
 
-	public String getPaperId() {
-		return paperId;
-	}
+    public void setPaperId(String paperId) {
+        this.paperId = paperId;
+    }
 
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
+    public ExamRecordStatus getStatus() {
+        return status;
+    }
 
-	public ExamRecordStatus getStatus() {
-		return status;
-	}
+    public void setStatus(ExamRecordStatus status) {
+        this.status = status;
+    }
 
-	public void setStatus(ExamRecordStatus status) {
-		this.status = status;
-	}
+    public String getOrgName() {
+        return orgName;
+    }
 
-	public String getOrgName() {
-		return orgName;
-	}
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
 
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
+    public List<ExamRecordFileAnswerInfo> getOfflineFiles() {
+        return offlineFiles;
+    }
 
-	public List<ExamRecordFileAnswerInfo> getOfflineFiles() {
-		return offlineFiles;
-	}
+    public void setOfflineFiles(List<ExamRecordFileAnswerInfo> offlineFiles) {
+        this.offlineFiles = offlineFiles;
+    }
 
-	public void setOfflineFiles(List<ExamRecordFileAnswerInfo> offlineFiles) {
-		this.offlineFiles = offlineFiles;
-	}
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/OnHandExamInfo.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
-import java.util.Date;
-
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import com.alibaba.fastjson.JSONArray;
 
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+import java.util.Date;
 
-public class OnHandExamInfo implements JsonSerializable{
+public class OnHandExamInfo implements JsonSerializable {
 
     /**
      * 待考列表信息
@@ -64,10 +63,12 @@ public class OnHandExamInfo implements JsonSerializable{
      * 是否有效
      */
     //private Boolean isvalid;
+
     /**
      * 是否启用人脸识别
      */
     private Boolean faceEnable;
+
     /**
      * 进入考试是否验证人脸识别(强制、非强制)
      */
@@ -84,10 +85,10 @@ public class OnHandExamInfo implements JsonSerializable{
     private Boolean appExamEnabled;
 
     private Boolean examCycleEnabled;
-    
+
     private JSONArray examCycleWeek;
-    
-    private JSONArray examCycleTimeRange ;
+
+    private JSONArray examCycleTimeRange;
 
     public String getStudentName() {
         return studentName;
@@ -306,29 +307,29 @@ public class OnHandExamInfo implements JsonSerializable{
         this.appExamEnabled = appExamEnabled;
     }
 
-	public Boolean getExamCycleEnabled() {
-		return examCycleEnabled;
-	}
+    public Boolean getExamCycleEnabled() {
+        return examCycleEnabled;
+    }
+
+    public void setExamCycleEnabled(Boolean examCycleEnabled) {
+        this.examCycleEnabled = examCycleEnabled;
+    }
+
+    public JSONArray getExamCycleWeek() {
+        return examCycleWeek;
+    }
 
-	public void setExamCycleEnabled(Boolean examCycleEnabled) {
-		this.examCycleEnabled = examCycleEnabled;
-	}
+    public void setExamCycleWeek(JSONArray examCycleWeek) {
+        this.examCycleWeek = examCycleWeek;
+    }
 
-	public JSONArray getExamCycleWeek() {
-		return examCycleWeek;
-	}
+    public JSONArray getExamCycleTimeRange() {
+        return examCycleTimeRange;
+    }
 
-	public void setExamCycleWeek(JSONArray examCycleWeek) {
-		this.examCycleWeek = examCycleWeek;
-	}
+    public void setExamCycleTimeRange(JSONArray examCycleTimeRange) {
+        this.examCycleTimeRange = examCycleTimeRange;
+    }
 
-	public JSONArray getExamCycleTimeRange() {
-		return examCycleTimeRange;
-	}
 
-	public void setExamCycleTimeRange(JSONArray examCycleTimeRange) {
-		this.examCycleTimeRange = examCycleTimeRange;
-	}
-    
-    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/PaperStructInfo.java

@@ -8,7 +8,7 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.enums.QuesStructType;
  * 试卷结构。一套试卷结构包含多条数据，即多个大题
  * Created by zhengmin on 2016/8/18.
  */
-public class PaperStructInfo implements JsonSerializable{
+public class PaperStructInfo implements JsonSerializable {
 
     private static final long serialVersionUID = 3386140600282845440L;
 
@@ -46,19 +46,21 @@ public class PaperStructInfo implements JsonSerializable{
      * 每小题分
      */
     private String score;
-    
-	/**
-	 * 答对数量
-	 */
-	private int succQuestionNum;
-	/**
-	 * 答错数量
-	 */
-	private int failQuestionNum;
-	/**
-	 * 未作答
-	 */
-	private Integer notAnsweredCount;
+
+    /**
+     * 答对数量
+     */
+    private int succQuestionNum;
+
+    /**
+     * 答错数量
+     */
+    private int failQuestionNum;
+
+    /**
+     * 未作答
+     */
+    private Integer notAnsweredCount;
 
     public int getIndex() {
         return index;
@@ -116,28 +118,28 @@ public class PaperStructInfo implements JsonSerializable{
         this.questionCount = questionCount;
     }
 
-	public int getSuccQuestionNum() {
-		return succQuestionNum;
-	}
+    public int getSuccQuestionNum() {
+        return succQuestionNum;
+    }
+
+    public void setSuccQuestionNum(int succQuestionNum) {
+        this.succQuestionNum = succQuestionNum;
+    }
 
-	public void setSuccQuestionNum(int succQuestionNum) {
-		this.succQuestionNum = succQuestionNum;
-	}
+    public int getFailQuestionNum() {
+        return failQuestionNum;
+    }
 
-	public int getFailQuestionNum() {
-		return failQuestionNum;
-	}
+    public void setFailQuestionNum(int failQuestionNum) {
+        this.failQuestionNum = failQuestionNum;
+    }
 
-	public void setFailQuestionNum(int failQuestionNum) {
-		this.failQuestionNum = failQuestionNum;
-	}
+    public Integer getNotAnsweredCount() {
+        return notAnsweredCount;
+    }
 
-	public Integer getNotAnsweredCount() {
-		return notAnsweredCount;
-	}
+    public void setNotAnsweredCount(Integer notAnsweredCount) {
+        this.notAnsweredCount = notAnsweredCount;
+    }
 
-	public void setNotAnsweredCount(Integer notAnsweredCount) {
-		this.notAnsweredCount = notAnsweredCount;
-	}
-    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/PracticeCourseInfo.java

@@ -1,22 +1,21 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
-import java.util.Date;
-
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import com.alibaba.fastjson.JSONArray;
 
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+import java.util.Date;
 
-public class PracticeCourseInfo implements JsonSerializable{
+public class PracticeCourseInfo implements JsonSerializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3648502707781974505L;
+    /**
+     *
+     */
+    private static final long serialVersionUID = 3648502707781974505L;
+
+    private Long examId;
 
-	private Long examId;
-	    
     private String examName;
-    
+
     private String examType;
 
     private Long examStudentId;
@@ -33,10 +32,12 @@ public class PracticeCourseInfo implements JsonSerializable{
      * 练习次数
      */
     private long practiceCount;
+
     /**
      * 最高正确率
      */
     private double maxObjectiveAccuracy;
+
     /**
      * 平均正确率
      */
@@ -50,150 +51,149 @@ public class PracticeCourseInfo implements JsonSerializable{
     private Date startTime;//考试时间范围开始时间
 
     private Date endTime; //考试时间范围结束时间
-    
+
     private Boolean examCycleEnabled;
-    
+
     private JSONArray examCycleWeek;
-    
-    private JSONArray examCycleTimeRange ;
 
-	public Long getExamId() {
-		return examId;
-	}
+    private JSONArray examCycleTimeRange;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
+
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public long getPracticeCount() {
+        return practiceCount;
+    }
+
+    public void setPracticeCount(long practiceCount) {
+        this.practiceCount = practiceCount;
+    }
+
+    public double getMaxObjectiveAccuracy() {
+        return maxObjectiveAccuracy;
+    }
+
+    public void setMaxObjectiveAccuracy(double maxObjectiveAccuracy) {
+        this.maxObjectiveAccuracy = maxObjectiveAccuracy;
+    }
+
+    public double getAveObjectiveAccuracy() {
+        return aveObjectiveAccuracy;
+    }
+
+    public void setAveObjectiveAccuracy(double aveObjectiveAccuracy) {
+        this.aveObjectiveAccuracy = aveObjectiveAccuracy;
+    }
+
+    public double getRecentObjectiveAccuracy() {
+        return recentObjectiveAccuracy;
+    }
 
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
+    public void setRecentObjectiveAccuracy(double recentObjectiveAccuracy) {
+        this.recentObjectiveAccuracy = recentObjectiveAccuracy;
+    }
 
-	public String getExamName() {
-		return examName;
-	}
+    public Date getStartTime() {
+        return startTime;
+    }
 
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
 
-	public Long getExamStudentId() {
-		return examStudentId;
-	}
+    public Date getEndTime() {
+        return endTime;
+    }
 
-	public void setExamStudentId(Long examStudentId) {
-		this.examStudentId = examStudentId;
-	}
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 
-	public String getCourseName() {
-		return courseName;
-	}
+    public String getExamType() {
+        return examType;
+    }
 
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
+    public void setExamType(String examType) {
+        this.examType = examType;
+    }
 
-	public String getCourseCode() {
-		return courseCode;
-	}
+    public Boolean getExamCycleEnabled() {
+        return examCycleEnabled;
+    }
 
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getStudentName() {
-		return studentName;
-	}
-
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
-
-	public long getPracticeCount() {
-		return practiceCount;
-	}
-
-	public void setPracticeCount(long practiceCount) {
-		this.practiceCount = practiceCount;
-	}
-
-	public double getMaxObjectiveAccuracy() {
-		return maxObjectiveAccuracy;
-	}
-
-	public void setMaxObjectiveAccuracy(double maxObjectiveAccuracy) {
-		this.maxObjectiveAccuracy = maxObjectiveAccuracy;
-	}
-
-	public double getAveObjectiveAccuracy() {
-		return aveObjectiveAccuracy;
-	}
-
-	public void setAveObjectiveAccuracy(double aveObjectiveAccuracy) {
-		this.aveObjectiveAccuracy = aveObjectiveAccuracy;
-	}
-
-	public double getRecentObjectiveAccuracy() {
-		return recentObjectiveAccuracy;
-	}
-
-	public void setRecentObjectiveAccuracy(double recentObjectiveAccuracy) {
-		this.recentObjectiveAccuracy = recentObjectiveAccuracy;
-	}
-
-	public Date getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
+    public void setExamCycleEnabled(Boolean examCycleEnabled) {
+        this.examCycleEnabled = examCycleEnabled;
+    }
 
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
 
-	public String getExamType() {
-		return examType;
-	}
+    public JSONArray getExamCycleWeek() {
+        return examCycleWeek;
+    }
 
-	public void setExamType(String examType) {
-		this.examType = examType;
-	}
+    public void setExamCycleWeek(JSONArray examCycleWeek) {
+        this.examCycleWeek = examCycleWeek;
+    }
 
-	public Boolean getExamCycleEnabled() {
-		return examCycleEnabled;
-	}
+    public JSONArray getExamCycleTimeRange() {
+        return examCycleTimeRange;
+    }
 
-	public void setExamCycleEnabled(Boolean examCycleEnabled) {
-		this.examCycleEnabled = examCycleEnabled;
-	}
+    public void setExamCycleTimeRange(JSONArray examCycleTimeRange) {
+        this.examCycleTimeRange = examCycleTimeRange;
+    }
 
-	
-	public JSONArray getExamCycleWeek() {
-		return examCycleWeek;
-	}
-
-	public void setExamCycleWeek(JSONArray examCycleWeek) {
-		this.examCycleWeek = examCycleWeek;
-	}
-
-	public JSONArray getExamCycleTimeRange() {
-		return examCycleTimeRange;
-	}
-
-	public void setExamCycleTimeRange(JSONArray examCycleTimeRange) {
-		this.examCycleTimeRange = examCycleTimeRange;
-	}
-	
-	
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/PracticeDetailInfo.java

@@ -1,73 +1,73 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
+import java.util.List;
+
 /**
- * 
- * @author  	chenken
- * @date    	2018年9月7日 上午10:23:19
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年9月7日 上午10:23:19
+ * @company QMTH
  * @description 答题情况统计
  */
 public class PracticeDetailInfo implements JsonSerializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1712307616138306152L;
-
-	private Long id;
-
-	private String courseName;
-
-	private String courseCode;
-	/**
-	 * 客观题正确率
-	 */
-	private double objectiveAccuracy;
-	
-	private List<PaperStructInfo> paperStructInfos;
-	
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public double getObjectiveAccuracy() {
-		return objectiveAccuracy;
-	}
-
-	public void setObjectiveAccuracy(double objectiveAccuracy) {
-		this.objectiveAccuracy = objectiveAccuracy;
-	}
-
-	public List<PaperStructInfo> getPaperStructInfos() {
-		return paperStructInfos;
-	}
-
-	public void setPaperStructInfos(List<PaperStructInfo> paperStructInfos) {
-		this.paperStructInfos = paperStructInfos;
-	}
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1712307616138306152L;
+
+    private Long id;
+
+    private String courseName;
+
+    private String courseCode;
+
+    /**
+     * 客观题正确率
+     */
+    private double objectiveAccuracy;
+
+    private List<PaperStructInfo> paperStructInfos;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public double getObjectiveAccuracy() {
+        return objectiveAccuracy;
+    }
+
+    public void setObjectiveAccuracy(double objectiveAccuracy) {
+        this.objectiveAccuracy = objectiveAccuracy;
+    }
+
+    public List<PaperStructInfo> getPaperStructInfos() {
+        return paperStructInfos;
+    }
+
+    public void setPaperStructInfos(List<PaperStructInfo> paperStructInfos) {
+        this.paperStructInfos = paperStructInfos;
+    }
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/PracticeRecordInfo.java

@@ -1,135 +1,165 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
+import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+
 import java.util.Date;
 
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+public class PracticeRecordInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -5420413503946583744L;
+
+    private Long id;
+
+    private String examName;
+
+    private String courseName;
+
+    private String courseCode;
+
+    private Date startTime;
+
+    private Date endTime;
+
+    /**
+     * 考生考试使用的考试时长
+     */
+    private Long usedExamTime;
+
+    /**
+     * 题目数量
+     */
+    private Integer totalQuestionCount;
+
+    /**
+     * 答对数量
+     */
+    private Integer succQuestionNum;
+
+    /**
+     * 答错数量
+     */
+    private Integer failQuestionNum;
+
+    /**
+     * 未作答
+     */
+    private Integer notAnsweredCount;
+
+    /**
+     * 客观题正确率
+     */
+    private Double objectiveAccuracy;
+
+    /**
+     * 客观题数量
+     */
+    private Integer objectiveNum;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Long getUsedExamTime() {
+        return usedExamTime;
+    }
+
+    public void setUsedExamTime(Long usedExamTime) {
+        this.usedExamTime = usedExamTime;
+    }
+
+    public Integer getTotalQuestionCount() {
+        return totalQuestionCount;
+    }
+
+    public void setTotalQuestionCount(Integer totalQuestionCount) {
+        this.totalQuestionCount = totalQuestionCount;
+    }
+
+    public Integer getSuccQuestionNum() {
+        return succQuestionNum;
+    }
+
+    public void setSuccQuestionNum(Integer succQuestionNum) {
+        this.succQuestionNum = succQuestionNum;
+    }
+
+    public Integer getFailQuestionNum() {
+        return failQuestionNum;
+    }
+
+    public void setFailQuestionNum(Integer failQuestionNum) {
+        this.failQuestionNum = failQuestionNum;
+    }
+
+    public Integer getNotAnsweredCount() {
+        return notAnsweredCount;
+    }
+
+    public void setNotAnsweredCount(Integer notAnsweredCount) {
+        this.notAnsweredCount = notAnsweredCount;
+    }
+
+    public Double getObjectiveAccuracy() {
+        return objectiveAccuracy;
+    }
+
+    public void setObjectiveAccuracy(Double objectiveAccuracy) {
+        this.objectiveAccuracy = objectiveAccuracy;
+    }
+
+    public Integer getObjectiveNum() {
+        return objectiveNum;
+    }
+
+    public void setObjectiveNum(Integer objectiveNum) {
+        this.objectiveNum = objectiveNum;
+    }
 
-public class PracticeRecordInfo implements JsonSerializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -5420413503946583744L;
-
-	private Long id;
-
-	private String examName;
-
-	private String courseName;
-
-	private String courseCode;
-
-	private Date startTime;
-
-	private Date endTime;
-
-	/**
-	 * 考生考试使用的考试时长
-	 */
-	private Long usedExamTime;
-
-	/**
-	 * 题目数量
-	 */
-	private Integer totalQuestionCount;
-	/**
-	 * 答对数量
-	 */
-	private Integer succQuestionNum;
-	/**
-	 * 答错数量
-	 */
-	private Integer failQuestionNum;
-	/**
-	 * 未作答
-	 */
-	private Integer notAnsweredCount;
-	/**
-	 * 客观题正确率
-	 */
-	private Double objectiveAccuracy;
-	/**
-	 * 客观题数量
-	 */
-	private Integer objectiveNum;
-	
-	public Long getId() {
-		return id;
-	}
-	public void setId(Long id) {
-		this.id = id;
-	}
-	public String getExamName() {
-		return examName;
-	}
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-	public String getCourseName() {
-		return courseName;
-	}
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-	public String getCourseCode() {
-		return courseCode;
-	}
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-	public Date getStartTime() {
-		return startTime;
-	}
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-	public Date getEndTime() {
-		return endTime;
-	}
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	public Long getUsedExamTime() {
-		return usedExamTime;
-	}
-	public void setUsedExamTime(Long usedExamTime) {
-		this.usedExamTime = usedExamTime;
-	}
-	public Integer getTotalQuestionCount() {
-		return totalQuestionCount;
-	}
-	public void setTotalQuestionCount(Integer totalQuestionCount) {
-		this.totalQuestionCount = totalQuestionCount;
-	}
-	public Integer getSuccQuestionNum() {
-		return succQuestionNum;
-	}
-	public void setSuccQuestionNum(Integer succQuestionNum) {
-		this.succQuestionNum = succQuestionNum;
-	}
-	public Integer getFailQuestionNum() {
-		return failQuestionNum;
-	}
-	public void setFailQuestionNum(Integer failQuestionNum) {
-		this.failQuestionNum = failQuestionNum;
-	}
-	public Integer getNotAnsweredCount() {
-		return notAnsweredCount;
-	}
-	public void setNotAnsweredCount(Integer notAnsweredCount) {
-		this.notAnsweredCount = notAnsweredCount;
-	}
-	public Double getObjectiveAccuracy() {
-		return objectiveAccuracy;
-	}
-	public void setObjectiveAccuracy(Double objectiveAccuracy) {
-		this.objectiveAccuracy = objectiveAccuracy;
-	}
-	public Integer getObjectiveNum() {
-		return objectiveNum;
-	}
-	public void setObjectiveNum(Integer objectiveNum) {
-		this.objectiveNum = objectiveNum;
-	}
-	
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/SubjectiveQuestionScoreInfo.java

@@ -2,63 +2,63 @@ package cn.com.qmth.examcloud.core.oe.admin.service.bean;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
-public class SubjectiveQuestionScoreInfo implements JsonSerializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4161659045086103440L;
-
-	/**
-	 * 考试记录ID
-	 */
-	private Long examRecordDataId;
-	
-	/**
-	 * 
-	 */
-	private String questionId;
-	
-	/**
-	 * 小题序号
-	 */
-	private Integer order;
-	
-	/**
-	 * 得分
-	 */
-	private Double score;
-
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
-
-	public String getQuestionId() {
-		return questionId;
-	}
-
-	public void setQuestionId(String questionId) {
-		this.questionId = questionId;
-	}
-
-	public Integer getOrder() {
-		return order;
-	}
-
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
-
-	public Double getScore() {
-		return score;
-	}
-
-	public void setScore(Double score) {
-		this.score = score;
-	}
-	
+public class SubjectiveQuestionScoreInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 4161659045086103440L;
+
+    /**
+     * 考试记录ID
+     */
+    private Long examRecordDataId;
+
+    /**
+     *
+     */
+    private String questionId;
+
+    /**
+     * 小题序号
+     */
+    private Integer order;
+
+    /**
+     * 得分
+     */
+    private Double score;
+
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
+
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
+
+    public String getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(String questionId) {
+        this.questionId = questionId;
+    }
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examaudit/ExamAuditEntityConvert.java

@@ -7,22 +7,19 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.mysql.cj.util.StringUtils;
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.data.domain.Page;
-
-import com.google.common.collect.Lists;
-
 import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.AuditStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.DisciplineType;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess;
+import com.google.common.collect.Lists;
+import com.mysql.cj.util.StringUtils;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.data.domain.Page;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 类信息转换
@@ -50,10 +47,10 @@ public class ExamAuditEntityConvert {
                     info.setFaceVerifyResult(result.getDesc());
                 }
 
-//                DisciplineType disciplineType = DisciplineType.tramsformByType(info.getDisciplineType());
-//                if (disciplineType != null) {
-//                    info.setDisciplineType(disciplineType.getName());
-//                }
+                //                DisciplineType disciplineType = DisciplineType.tramsformByType(info.getDisciplineType());
+                //                if (disciplineType != null) {
+                //                    info.setDisciplineType(disciplineType.getName());
+                //                }
 
                 list.add(info);
             } catch (Exception e) {
@@ -88,7 +85,7 @@ public class ExamAuditEntityConvert {
             excel.setFaceTotalCount(e.getFaceTotalCount());
             excel.setFaceSuccessPercent(e.getFaceSuccessPercent());
             if (!StringUtils.isNullOrEmpty(e.getDisciplineDetail()) && e.getDisciplineDetail().indexOf("&&") != -1) {
-                excel.setDisciplineDetail(e.getDisciplineDetail().replace("&&","\r\n"));
+                excel.setDisciplineDetail(e.getDisciplineDetail().replace("&&", "\r\n"));
             } else {
                 excel.setDisciplineDetail(e.getDisciplineDetail());
             }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examaudit/ExamAuditExcel.java

@@ -17,60 +17,77 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
  * @since: 2018/8/15
  */
 public class ExamAuditExcel implements JsonSerializable {
+
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1269194645888320744L;
-	@ExcelProperty(name = "考试记录ID", index = 2)
+     *
+     */
+    private static final long serialVersionUID = 1269194645888320744L;
+
+    @ExcelProperty(name = "考试记录ID", index = 2)
     private Long examRecordDataId;
+
     @ExcelProperty(name = "学习中心", index = 2)
     private String orgName;
+
     @ExcelProperty(name = "违纪类型", index = 13)
     private String disciplineType;
+
     @ExcelProperty(name = "批次名称", index = 1)
     private String examName;
+
     @ExcelProperty(name = "学号", index = 7)
     private String studentCode;
+
     @ExcelProperty(name = "姓名", index = 8)
     private String studentName;
+
     @ExcelProperty(name = "科目代码", index = 4)
     private String courseCode;
+
     @ExcelProperty(name = "考试科目", index = 3)
     private String courseName;
+
     @ExcelProperty(name = "课程层次", index = 6)
     private String courseLevel;
+
     @ExcelProperty(name = "成功次数", index = 10)
     private Integer faceSuccessCount;
+
     @ExcelProperty(name = "陌生人记录", index = 11)
     private Integer faceStrangerCount;
+
     @ExcelProperty(name = "校验次数", index = 9)
     private Integer faceTotalCount;
+
     @ExcelProperty(name = "成功率", index = 12)
     private Double faceSuccessPercent;
+
     @ExcelProperty(name = "客观题总分", index = 5)
     private Double objectiveScore;
+
     @ExcelProperty(name = "违纪描述", index = 14)
     private String disciplineDetail;
+
     @ExcelProperty(name = "Ip", index = 15)
     private String ip;
 
     public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
+        return examRecordDataId;
+    }
 
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
 
     public String getDisciplineType() {
-		return disciplineType;
-	}
+        return disciplineType;
+    }
 
-	public void setDisciplineType(String disciplineType) {
-		this.disciplineType = disciplineType;
-	}
+    public void setDisciplineType(String disciplineType) {
+        this.disciplineType = disciplineType;
+    }
 
-	public String getExamName() {
+    public String getExamName() {
         return examName;
     }
 
@@ -181,4 +198,5 @@ public class ExamAuditExcel implements JsonSerializable {
     public void setIp(String ip) {
         this.ip = ip;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examaudit/ExamAuditInfo.java

@@ -17,11 +17,13 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
  * @since: 2018/8/15
  */
 public class ExamAuditInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -7260035187571848686L;
+
     /**
-	 *
-	 */
-	private static final long serialVersionUID = -7260035187571848686L;
-	/**
      * 主键
      */
     private Long id;
@@ -34,6 +36,7 @@ public class ExamAuditInfo implements JsonSerializable {
      */
     @ExcelProperty(name = "审核结果", width = 30, index = 13)
     private String status;
+
     /**
      * 违纪详情
      */
@@ -41,6 +44,7 @@ public class ExamAuditInfo implements JsonSerializable {
 
     @ExcelProperty(name = "审核说明", width = 30, index = 12)
     private String disciplineType;
+
     /**
      * 审核人姓名
      */
@@ -51,128 +55,157 @@ public class ExamAuditInfo implements JsonSerializable {
      * 考试ID
      */
     private Long examId;
+
     /**
      * 考试名称
      */
     private String examName;
+
     /**
      * 考试类型
      */
     private String examType;
+
     /**
      * 考生ID
      */
     private Long examStudentId;
+
     /**
      * 学生ID
      */
     private Long studentId;
+
     /**
      * 学号
      */
     @ExcelProperty(name = "学号", width = 30, index = 4)
     private String studentCode;
+
     /**
      * 学生姓名
      */
     @ExcelProperty(name = "姓名", width = 30, index = 2)
     private String studentName;
+
     /**
      * 身份证号
      */
     @ExcelProperty(name = "身份证号", width = 30, index = 3)
     private String identityNumber;
+
     /**
      * 课程ID
      */
     private Long courseId;
+
     /**
      * 课程Code
      */
     private String courseCode;
+
     /**
      * 课程名称
      */
     @ExcelProperty(name = "课程", width = 30, index = 5)
     private String courseName;
+
     /**
      * 课程层次
      */
     @ExcelProperty(name = "课程层次", width = 30, index = 6)
     private String courseLevel;
+
     /**
      * 学习中心ID
      */
     private Long orgId;
+
     /**
      * 学习中名称
      */
     private String orgName;
+
     /**
      * 是否异常数据
      */
     private Boolean isWarn;
+
     /**
      * 是否被审核过
      */
     private Boolean isAudit;
+
     /**
      * 是否违纪
      */
     private Boolean isIllegality;
+
     /**
      * 考试记录状态(考试中,考试结束,考试过期,考试作废)
      */
     private String examRecordStatus;
+
     /**
      * 考试时长
      */
     private Long usedExamTime;
+
     /**
      * 第几次考试
      */
     @ExcelProperty(name = "考试次数", width = 30, index = 11)
     private Integer examOrder;
+
     /**
      * 是否为重考
      */
     private Boolean isReexamine;
+
     /**
      * 是否断点续考
      */
     private Boolean isContinued;
+
     /**
      * 断点续考次数
      */
     private Integer continuedCount;
+
     /**
      * 抓拍比对成功次数
      */
     @ExcelProperty(name = "成功次数", width = 30, index = 8)
     private Integer faceSuccessCount;
+
     /**
      * 抓拍比对失败次数
      */
     private Integer faceFailedCount;
+
     /**
      * 抓拍存在陌生人的次数
      */
     @ExcelProperty(name = "陌生人记录", width = 30, index = 9)
     private Integer faceStrangerCount;
+
     /**
      * 抓拍比对总次数
      */
     @ExcelProperty(name = "校验次数", width = 30, index = 7)
     private Integer faceTotalCount;
+
     /**
      * 抓拍比对成功比率
      */
     @ExcelProperty(name = "人脸识别成功率（%）", width = 30, index = 10)
     private Double faceSuccessPercent;
+
     /**
      * 活体检测结果
      */
     private String faceVerifyResult;
+
     /**
      * 人脸五官坐标比对值
      */
@@ -459,29 +492,29 @@ public class ExamAuditInfo implements JsonSerializable {
         this.faceLandmarkVal = faceLandmarkVal;
     }
 
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
 
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
 
-	public String getDisciplineType() {
-		return disciplineType;
-	}
+    public String getDisciplineType() {
+        return disciplineType;
+    }
 
-	public void setDisciplineType(String disciplineType) {
-		this.disciplineType = disciplineType;
-	}
+    public void setDisciplineType(String disciplineType) {
+        this.disciplineType = disciplineType;
+    }
 
-	public String getAuditUserName() {
-		return auditUserName;
-	}
+    public String getAuditUserName() {
+        return auditUserName;
+    }
 
-	public void setAuditUserName(String auditUserName) {
-		this.auditUserName = auditUserName;
-	}
+    public void setAuditUserName(String auditUserName) {
+        this.auditUserName = auditUserName;
+    }
 
     public String getOrgName() {
         return orgName;
@@ -530,4 +563,5 @@ public class ExamAuditInfo implements JsonSerializable {
     public void setIp(String ip) {
         this.ip = ip;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examaudit/ExamAuditQuery.java

@@ -20,48 +20,70 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel
 public class ExamAuditQuery implements JsonSerializable {
+
     @ApiModelProperty("当前页数")
     private Integer pageNo;
+
     @ApiModelProperty("每页条数")
     private Integer pageSize;
+
     @ApiModelProperty("学习中心ID")
     private Long orgId;
+
     @ApiModelProperty("机构ID")
     private Long rootOrgId;
+
     @ApiModelProperty("考试ID")
     private Long examId;
+
     @ApiModelProperty("场次ID")
     private Long examStageId;
+
     @ApiModelProperty("学号")
     private String studentCode;
+
     @ApiModelProperty("学生姓名")
     private String studentName;
+
     @ApiModelProperty("身份证号")
     private String identityNumber;
+
     @ApiModelProperty("课程ID")
     private Long courseId;
+
     @ApiModelProperty("课程层次")
     private String courseLevel;
+
     @ApiModelProperty("考试记录ID")
     private Long examRecordDataId;
+
     @ApiModelProperty("审核状态")
     private String status;
+
     @ApiModelProperty("违纪类型")
     private String disciplineType;
+
     @ApiModelProperty("审核人")
     private String auditUserName;
+
     @ApiModelProperty("开考起始时间")
     private String startTime;
+
     @ApiModelProperty("开考截止时间")
     private String endTime;
+
     @ApiModelProperty("交卷起始时间")
     private String submitStartTime;
+
     @ApiModelProperty("交卷截止时间")
     private String submitEndTime;
+
     @ApiModelProperty("审核起始时间")
     private String auditStartTime;
+
     @ApiModelProperty("审核截止时间")
     private String auditEndTime;
+
     @ApiModelProperty("Ip")
     private String ip;
 
@@ -158,41 +180,41 @@ public class ExamAuditQuery implements JsonSerializable {
         this.status = status;
     }
 
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
 
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
 
-	public SelectType getSelectType() {
-		return selectType;
-	}
+    public SelectType getSelectType() {
+        return selectType;
+    }
 
-	public void setSelectType(SelectType selectType) {
-		this.selectType = selectType;
-	}
+    public void setSelectType(SelectType selectType) {
+        this.selectType = selectType;
+    }
 
-	public String getDisciplineType() {
-		return disciplineType;
-	}
+    public String getDisciplineType() {
+        return disciplineType;
+    }
 
-	public void setDisciplineType(String disciplineType) {
-		this.disciplineType = disciplineType;
-	}
+    public void setDisciplineType(String disciplineType) {
+        this.disciplineType = disciplineType;
+    }
 
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
 
-	public String getAuditUserName() {
-		return auditUserName;
-	}
+    public String getAuditUserName() {
+        return auditUserName;
+    }
 
-	public void setAuditUserName(String auditUserName) {
-		this.auditUserName = auditUserName;
-	}
+    public void setAuditUserName(String auditUserName) {
+        this.auditUserName = auditUserName;
+    }
 
     public Long getExamStageId() {
         return examStageId;
@@ -257,4 +279,5 @@ public class ExamAuditQuery implements JsonSerializable {
     public void setIp(String ip) {
         this.ip = ip;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examaudit/RedoAuditInfo.java

@@ -1,83 +1,83 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit;
 
-import java.util.List;
-
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
+import java.util.List;
+
 
 /**
- *
- * @author  	chenken
- * @date    	2019年1月15日 上午9:59:14
- * @company 	QMTH
+ * @author chenken
+ * @date 2019年1月15日 上午9:59:14
+ * @company QMTH
  * @description 重新审核
  */
-public class RedoAuditInfo implements JsonSerializable{
-
-	/**
-	 *
-	 */
-	private static final long serialVersionUID = 5158278733859663008L;
-
-	private List<Long> examRecordDataIds;
-
-	/**
-	 * 是否通过
-	 */
-	private Boolean isPass;
-
-	/**
-	 * 违纪类型id
-	 */
-	private Long illegallyTypeId;
-
-	/**
-	 * 违纪类型
-	 */
-	private String disciplineType;
-
-	/**
-	 * 违纪详情
-	 */
-	private String disciplineDetail;
-
-	public List<Long> getExamRecordDataIds() {
-		return examRecordDataIds;
-	}
-
-	public void setExamRecordDataIds(List<Long> examRecordDataIds) {
-		this.examRecordDataIds = examRecordDataIds;
-	}
-
-	public Boolean getIsPass() {
-		return isPass;
-	}
-
-	public void setIsPass(Boolean isPass) {
-		this.isPass = isPass;
-	}
-
-	public String getDisciplineType() {
-		return disciplineType;
-	}
-
-	public void setDisciplineType(String disciplineType) {
-		this.disciplineType = disciplineType;
-	}
-
-	public String getDisciplineDetail() {
-		return disciplineDetail;
-	}
-
-	public void setDisciplineDetail(String disciplineDetail) {
-		this.disciplineDetail = disciplineDetail;
-	}
-
-	public Long getIllegallyTypeId() {
-		return illegallyTypeId;
-	}
-
-	public void setIllegallyTypeId(Long illegallyTypeId) {
-		this.illegallyTypeId = illegallyTypeId;
-	}
+public class RedoAuditInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 5158278733859663008L;
+
+    private List<Long> examRecordDataIds;
+
+    /**
+     * 是否通过
+     */
+    private Boolean isPass;
+
+    /**
+     * 违纪类型id
+     */
+    private Long illegallyTypeId;
+
+    /**
+     * 违纪类型
+     */
+    private String disciplineType;
+
+    /**
+     * 违纪详情
+     */
+    private String disciplineDetail;
+
+    public List<Long> getExamRecordDataIds() {
+        return examRecordDataIds;
+    }
+
+    public void setExamRecordDataIds(List<Long> examRecordDataIds) {
+        this.examRecordDataIds = examRecordDataIds;
+    }
+
+    public Boolean getIsPass() {
+        return isPass;
+    }
+
+    public void setIsPass(Boolean isPass) {
+        this.isPass = isPass;
+    }
+
+    public String getDisciplineType() {
+        return disciplineType;
+    }
+
+    public void setDisciplineType(String disciplineType) {
+        this.disciplineType = disciplineType;
+    }
+
+    public String getDisciplineDetail() {
+        return disciplineDetail;
+    }
+
+    public void setDisciplineDetail(String disciplineDetail) {
+        this.disciplineDetail = disciplineDetail;
+    }
+
+    public Long getIllegallyTypeId() {
+        return illegallyTypeId;
+    }
+
+    public void setIllegallyTypeId(Long illegallyTypeId) {
+        this.illegallyTypeId = illegallyTypeId;
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examcapture/ExamCaptureAuditInfo.java

@@ -16,15 +16,16 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @since: 2018/8/31
  */
 public class ExamCaptureAuditInfo implements JsonSerializable {
+
     /**
-	 *
-	 */
-	private static final long serialVersionUID = 6991258456890821018L;
+     *
+     */
+    private static final long serialVersionUID = 6991258456890821018L;
 
-	/**
+    /**
      * 考试记录ID
      */
-	private Long examRecordDataId;
+    private Long examRecordDataId;
 
     private Long studentId;
 
@@ -43,47 +44,59 @@ public class ExamCaptureAuditInfo implements JsonSerializable {
      * 审核状态
      */
     private String status;
+
     /**
      * 违纪详情
      */
     private String disciplineDetail;
+
     private String disciplineType;
+
     /**
      * 是否异常数据
      */
     private Boolean isWarn;
+
     /**
      * 是否被审核过
      */
     private Boolean isAudit;
+
     /**
      * 是否违纪
      */
     private Boolean isIllegality;
+
     /**
      * 抓拍比对成功次数
      */
     private Integer faceSuccessCount;
+
     /**
      * 抓拍比对失败次数
      */
     private Integer faceFailedCount;
+
     /**
      * 抓拍存在陌生人的次数
      */
     private Integer faceStrangerCount;
+
     /**
      * 抓拍比对总次数
      */
     private Integer faceTotalCount;
+
     /**
      * 抓拍比对成功比率
      */
     private Double faceSuccessPercent;
+
     /**
      * 活体检测结果
      */
     private String faceVerifyResult;
+
     /**
      * 人脸五官坐标比对值
      */
@@ -99,7 +112,7 @@ public class ExamCaptureAuditInfo implements JsonSerializable {
      */
     private String virtualCameraNames;
 
-/**
+    /**
      * 同步抓拍照片URL
      */
     private String syncCaptureFileUrl;
@@ -201,112 +214,112 @@ public class ExamCaptureAuditInfo implements JsonSerializable {
         this.faceLandmarkVal = faceLandmarkVal;
     }
 
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
 
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
 
-	public String getDisciplineType() {
-		return disciplineType;
-	}
+    public String getDisciplineType() {
+        return disciplineType;
+    }
 
-	public void setDisciplineType(String disciplineType) {
-		this.disciplineType = disciplineType;
-	}
+    public void setDisciplineType(String disciplineType) {
+        this.disciplineType = disciplineType;
+    }
 
-	public String getStudentName() {
-		return studentName;
-	}
+    public String getStudentName() {
+        return studentName;
+    }
 
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
 
-	public String getStudentCode() {
-		return studentCode;
-	}
+    public String getStudentCode() {
+        return studentCode;
+    }
 
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
 
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
 
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
 
-	public String getCourseCode() {
-		return courseCode;
-	}
+    public String getCourseCode() {
+        return courseCode;
+    }
 
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
 
-	public String getCourseName() {
-		return courseName;
-	}
+    public String getCourseName() {
+        return courseName;
+    }
 
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
 
-	public Boolean getIsWarn() {
-		return isWarn;
-	}
+    public Boolean getIsWarn() {
+        return isWarn;
+    }
 
-	public void setIsWarn(Boolean isWarn) {
-		this.isWarn = isWarn;
-	}
+    public void setIsWarn(Boolean isWarn) {
+        this.isWarn = isWarn;
+    }
 
-	public Long getStudentId() {
-		return studentId;
-	}
+    public Long getStudentId() {
+        return studentId;
+    }
 
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
 
-	public Boolean getIsAudit() {
-		return isAudit;
-	}
+    public Boolean getIsAudit() {
+        return isAudit;
+    }
 
-	public void setIsAudit(Boolean isAudit) {
-		this.isAudit = isAudit;
-	}
+    public void setIsAudit(Boolean isAudit) {
+        this.isAudit = isAudit;
+    }
 
-	public Boolean getIsIllegality() {
-		return isIllegality;
-	}
+    public Boolean getIsIllegality() {
+        return isIllegality;
+    }
 
-	public void setIsIllegality(Boolean isIllegality) {
-		this.isIllegality = isIllegality;
-	}
+    public void setIsIllegality(Boolean isIllegality) {
+        this.isIllegality = isIllegality;
+    }
 
-	public Double getBaiduFaceLivenessSuccessPercent() {
-		return baiduFaceLivenessSuccessPercent;
-	}
+    public Double getBaiduFaceLivenessSuccessPercent() {
+        return baiduFaceLivenessSuccessPercent;
+    }
 
-	public void setBaiduFaceLivenessSuccessPercent(
-			Double baiduFaceLivenessSuccessPercent) {
-		this.baiduFaceLivenessSuccessPercent = baiduFaceLivenessSuccessPercent;
-	}
+    public void setBaiduFaceLivenessSuccessPercent(
+            Double baiduFaceLivenessSuccessPercent) {
+        this.baiduFaceLivenessSuccessPercent = baiduFaceLivenessSuccessPercent;
+    }
 
-	public String getVirtualCameraNames() {
-		return virtualCameraNames;
-	}
+    public String getVirtualCameraNames() {
+        return virtualCameraNames;
+    }
 
-	public void setVirtualCameraNames(String virtualCameraNames) {
-		this.virtualCameraNames = virtualCameraNames;
-	}
+    public void setVirtualCameraNames(String virtualCameraNames) {
+        this.virtualCameraNames = virtualCameraNames;
+    }
 
-	public String getSyncCaptureFileUrl() {
+    public String getSyncCaptureFileUrl() {
         return syncCaptureFileUrl;
     }
 
@@ -353,4 +366,5 @@ public class ExamCaptureAuditInfo implements JsonSerializable {
     public void setSwitchScreenCount(Integer switchScreenCount) {
         this.switchScreenCount = switchScreenCount;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examcapture/ExamCaptureInfo.java

@@ -16,22 +16,27 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @since: 2018/8/31
  */
 public class ExamCaptureInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 3199275931294184644L;
+
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = 3199275931294184644L;
-	/**
      * 主键
      */
     private Long id;
+
     /**
      * ec_oe_exam_record_data_ID
      */
     private Long examRecordDataId;
+
     /**
      * 文件URL
      */
     private String fileUrl;
+
     /**
      * 返回信息(JSON)
      */
@@ -41,6 +46,7 @@ public class ExamCaptureInfo implements JsonSerializable {
      * 人脸比较是否通过
      */
     private Boolean isPass;
+
     /**
      * 是否有陌生人 1是 0否
      * 就是摄像头拍到不止考生一人
@@ -51,7 +57,7 @@ public class ExamCaptureInfo implements JsonSerializable {
      * 百度活体检测是否通过
      */
     private Boolean isFacelivenessPass;
-    
+
     /**
      * 虚拟摄像头名称
      */
@@ -105,20 +111,20 @@ public class ExamCaptureInfo implements JsonSerializable {
         this.isStranger = stranger;
     }
 
-	public Boolean getIsFacelivenessPass() {
-		return isFacelivenessPass;
-	}
+    public Boolean getIsFacelivenessPass() {
+        return isFacelivenessPass;
+    }
 
-	public void setIsFacelivenessPass(Boolean isFacelivenessPass) {
-		this.isFacelivenessPass = isFacelivenessPass;
-	}
+    public void setIsFacelivenessPass(Boolean isFacelivenessPass) {
+        this.isFacelivenessPass = isFacelivenessPass;
+    }
 
-	public String getVirtualCameraNames() {
-		return virtualCameraNames;
-	}
+    public String getVirtualCameraNames() {
+        return virtualCameraNames;
+    }
 
-	public void setVirtualCameraNames(String virtualCameraNames) {
-		this.virtualCameraNames = virtualCameraNames;
-	}
+    public void setVirtualCameraNames(String virtualCameraNames) {
+        this.virtualCameraNames = virtualCameraNames;
+    }
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamRecordDataBean.java

@@ -1,63 +1,76 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord;
 
-import java.util.Date;
-
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess;
 
+import java.util.Date;
+
 public class ExamRecordDataBean implements JsonSerializable {
+
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 1341159150606432450L;
+
     /**
      * 主键
      */
     private Long id;
+
     /**
      * 考试ID
      */
     private Long examId;
+
     /**
      * 考试类型
      */
     private ExamType examType;
+
     /**
      * 考生ID
      */
     private Long examStudentId;
+
     /**
      * 学生ID
      */
     private Long studentId;
+
     /**
      * 学号
      */
     private String studentCode;
+
     /**
      * 学生姓名
      */
     private String studentName;
+
     /**
      * 身份证号
      */
     private String identityNumber;
+
     /**
      * 课程ID
      */
     private Long courseId;
 
     private String courseLevel;
+
     /**
      * 学习中心ID
      */
     private Long orgId;
+
     /**
      * 顶级机构ID
      */
     private Long rootOrgId;
+
     /**
      * 基础试卷ID
      */
@@ -67,10 +80,12 @@ public class ExamRecordDataBean implements JsonSerializable {
      * 试卷类型
      */
     private String paperType;
+
     /**
      * 试卷结构 ID
      */
     private String paperStructId;
+
     /**
      * 采集人
      */
@@ -80,30 +95,37 @@ public class ExamRecordDataBean implements JsonSerializable {
      * 考试作答记录id
      */
     private String examRecordQuestionsId;
+
     /**
      * 考试记录状态(考试中,考试结束,考试过期,考试作废)
      */
     private ExamRecordStatus examRecordStatus;
+
     /**
      * 考试开始时间
      */
     private Date startTime;
+
     /**
      * 考试结束时间
      */
     private Date endTime;
+
     /**
      * 考试被清理时间
      */
     private Date cleanTime;
+
     /**
      * 是否异常数据
      */
     private Boolean isWarn;
+
     /**
      * 是否被审核过
      */
     private Boolean isAudit;
+
     /**
      * 是否违纪
      */
@@ -113,50 +135,62 @@ public class ExamRecordDataBean implements JsonSerializable {
      * 考试时长
      */
     private Long usedExamTime;
+
     /**
      * 第几次考试
      */
     private Integer examOrder;
+
     /**
      * 是否为重考
      */
     private Boolean isReexamine;
+
     /**
      * 是否断点续考
      */
     private Boolean isContinued;
+
     /**
      * 是否是全客观题卷  1:是   0:否
      */
     private Boolean isAllObjectivePaper;
+
     /**
      * 断点续考次数
      */
     private Integer continuedCount;
+
     /**
      * 是否达到最大断点限制
      */
     private Boolean isExceed;
+
     /**
      * 抓拍比对成功次数
      */
     private Integer faceSuccessCount;
+
     /**
      * 抓拍比对失败次数
      */
     private Integer faceFailedCount;
+
     /**
      * 抓拍存在陌生人的次数
      */
     private Integer faceStrangerCount;
+
     /**
      * 抓拍比对总次数
      */
     private Integer faceTotalCount;
+
     /**
      * 抓拍比对成功比率
      */
     private Double faceSuccessPercent;
+
     /**
      * @see cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess
      * 活体检测结果
@@ -167,6 +201,7 @@ public class ExamRecordDataBean implements JsonSerializable {
      * 百度人脸活体检测通过率
      */
     private Double baiduFaceLivenessSuccessPercent;
+
     /**
      * 人脸五官坐标比对值
      */
@@ -489,4 +524,5 @@ public class ExamRecordDataBean implements JsonSerializable {
     public void setExamRecordQuestionsId(String examRecordQuestionsId) {
         this.examRecordQuestionsId = examRecordQuestionsId;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamRecordEntityConvert.java

@@ -7,20 +7,6 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Component;
-
-import com.google.common.collect.Lists;
-
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.DateUtils;
@@ -37,6 +23,18 @@ import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
 import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 类信息转换
@@ -47,8 +45,8 @@ import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 @Component
 public class ExamRecordEntityConvert {
 
-	@Autowired
-	private ExamRecordDataRepo examRecordDataRepo;
+    @Autowired
+    private ExamRecordDataRepo examRecordDataRepo;
 
     @Autowired
     private GainBaseDataService gainBaseDataService;
@@ -56,11 +54,11 @@ public class ExamRecordEntityConvert {
     @Autowired
     private ExamScoreRepo examScoreRepo;
 
-    public  ExamRecordInfo of(ExamRecordDataEntity recordData,Map<String,Object> cahcheMap) {
+    public ExamRecordInfo of(ExamRecordDataEntity recordData, Map<String, Object> cahcheMap) {
         if (recordData == null) {
             return null;
         }
-        ExamRecordDataEntity record = GlobalHelper.getEntity(examRecordDataRepo,recordData.getId(),ExamRecordDataEntity.class);
+        ExamRecordDataEntity record = GlobalHelper.getEntity(examRecordDataRepo, recordData.getId(), ExamRecordDataEntity.class);
         if (record == null) {
             throw new StatusException(Constants.OE_CODE_500, "考试记录基础信息不存在！");
         }
@@ -159,7 +157,7 @@ public class ExamRecordEntityConvert {
 
         return info;
     }
-    
+
 
     public Page<ExamRecordInfo> of(Page<ExamRecordDataEntity> page) {
         Pageable pageable = PageRequest.of(page.getNumber(), page.getSize());
@@ -168,23 +166,24 @@ public class ExamRecordEntityConvert {
             return new PageImpl<ExamRecordInfo>(Lists.newArrayList(), pageable, page.getTotalElements());
         }
         //缓存
-        Map<String,Object> cahcheMap = new HashMap<String, Object>();
-        List<ExamRecordInfo> list = entities.stream().map(entity -> of(entity,cahcheMap)).collect(Collectors.toList());
+        Map<String, Object> cahcheMap = new HashMap<String, Object>();
+        List<ExamRecordInfo> list = entities.stream().map(entity -> of(entity, cahcheMap)).collect(Collectors.toList());
         return new PageImpl<ExamRecordInfo>(list, pageable, page.getTotalElements());
     }
 
     public List<ExamRecordInfo> ofList(List<ExamRecordDataEntity> entities) {
         //缓存
-        Map<String,Object> cahcheMap = new HashMap<>();
-        List<ExamRecordInfo> list = entities.stream().map(entity -> of(entity,cahcheMap)).collect(Collectors.toList());
+        Map<String, Object> cahcheMap = new HashMap<>();
+        List<ExamRecordInfo> list = entities.stream().map(entity -> of(entity, cahcheMap)).collect(Collectors.toList());
         return list;
     }
 
 
     public List<ExamRecordInfo> of(List<ExamRecordDataEntity> entities) {
-    	//缓存
-        Map<String,Object> cahcheMap = new HashMap<String, Object>();
-        List<ExamRecordInfo> list = entities.stream().map(entity -> of(entity,cahcheMap)).collect(Collectors.toList());
+        //缓存
+        Map<String, Object> cahcheMap = new HashMap<String, Object>();
+        List<ExamRecordInfo> list = entities.stream().map(entity -> of(entity, cahcheMap)).collect(Collectors.toList());
         return list;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamRecordFileAnswerInfo.java

@@ -16,10 +16,12 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @Version 1.0
  */
 public class ExamRecordFileAnswerInfo implements JsonSerializable {
+
     /**
-	 *
-	 */
-	private static final long serialVersionUID = -735354536432038902L;
+     *
+     */
+    private static final long serialVersionUID = -735354536432038902L;
+
     private Long id;
 
     /**
@@ -31,6 +33,7 @@ public class ExamRecordFileAnswerInfo implements JsonSerializable {
      * 文件路径:离线考试
      */
     private String offlineFileUrl;
+
     /**
      * 文件名称:离线考试
      */
@@ -119,4 +122,5 @@ public class ExamRecordFileAnswerInfo implements JsonSerializable {
     public void setOriginalFileName(String originalFileName) {
         this.originalFileName = originalFileName;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamRecordInfo.java

@@ -7,15 +7,15 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord;
 
-import java.util.Date;
-import java.util.List;
-
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess;
 import cn.com.qmth.examcloud.support.excel.ExcelProperty;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 考试记录
  *
@@ -23,254 +23,308 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
  * @since: 2018/8/15
  */
 public class ExamRecordInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -735354536432038902L;
+
     /**
-	 *
-	 */
-	private static final long serialVersionUID = -735354536432038902L;
-	/**
      * 考试记录ID
      */
     @ExcelProperty(name = "考试编码", width = 30, index = 14)
     private Long id;
+
     /**
      * 考试记录详细ID
      */
     private Long dataId;
+
     /**
      * 考试ID
      */
     private Long examId;
+
     /**
      * 考试类型
      */
     private String examType;
-    
+
     private ExamType examTypeValue;
+
     /**
      * 考试批次
      */
     @ExcelProperty(name = "考试批次", width = 30, index = 13)
     private String examName;
+
     /**
      * 考生ID
      */
     private Long examStudentId;
+
     /**
      * 学生ID
      */
     private Long studentId;
+
     /**
      * 学号
      */
     @ExcelProperty(name = "学号", width = 30, index = 2)
     private String studentCode;
+
     /**
      * 学生姓名
      */
     @ExcelProperty(name = "姓名", width = 30, index = 1)
     private String studentName;
+
     /**
      * 准考证号
      */
     @ExcelProperty(name = "准考证号", width = 30, index = 21)
     private String studentNumber;
+
     /**
      * 身份证号
      */
     @ExcelProperty(name = "身份证号", width = 30, index = 12)
     private String identityNumber;
+
     /**
      * 课程ID
      */
     private Long courseId;
+
     /**
      * 课程Code
      */
     @ExcelProperty(name = "课程代码", width = 30, index = 11)
     private String courseCode;
+
     /**
      * 课程名称
      */
     @ExcelProperty(name = "课程名称", width = 30, index = 7)
     private String courseName;
+
     /**
      * 课程名称(课程代码)
      */
     @ExcelProperty(name = "课程名称(课程代码)", width = 30, index = 10)
     private String courseNameAndCode;
+
     /**
      * 课程层次
      */
     @ExcelProperty(name = "层次", width = 30, index = 4)
     private String courseLevel;
+
     /**
      * 年级
      */
     @ExcelProperty(name = "年级", width = 30, index = 5)
     private String grade;
+
     /**
      * 专业
      */
     @ExcelProperty(name = "专业", width = 30, index = 6)
     private String specialtyName;
+
     /**
      * 学习中心ID
      */
     private Long orgId;
+
     /**
      * 学习中心名称
      */
     @ExcelProperty(name = "学习中心", width = 30, index = 3)
     private String orgName;
+
     /**
      * 顶级机构ID
      */
     private Long rootOrgId;
+
     /**
      * 基础试卷ID
      */
     private String basePaperId;
+
     /**
      * 试卷结构 ID
      */
     private String paperStructId;
+
     /**
      * 考试开始时间
      */
     private Date startTime;
+
     /**
      * 考试进入时间
      */
     @ExcelProperty(name = "考试进入时间", width = 30, index = 8)
     private String paperStartTime;
+
     /**
      * 考试结束时间
      */
     private Date endTime;
+
     /**
      * 考试被清理时间
      */
     private Date cleanTime;
+
     /**
      * 是否异常数据
      */
     private Boolean isWarn;
+
     /**
      * 是否被审核过
      */
     private Boolean isAudit;
+
     /**
      * 是否违纪
      */
     @ExcelProperty(name = "是否违纪(终审)", width = 30, index = 26)
     private String isIllegality;
-    
+
     private Boolean isIllegalityValue;
+
     /**
      * 考试记录状态(考试中,考试结束,考试过期,考试作废)
      */
     private String examRecordStatus;
-    
+
     private ExamRecordStatus examRecordStatusValue;
+
     /**
      * 采集人
      */
     @ExcelProperty(name = "信息采集人", width = 30, index = 29)
     private String infoCollector;
+
     /**
      * 考试时长
      */
     private Long usedExamTime;
+
     /**
      * 每次考试持续时间
      */
     @ExcelProperty(name = "每次考试持续时间", width = 30, index = 16)
     private String examTime;
+
     /**
      * 第几次考试
      */
     @ExcelProperty(name = "考试次数", width = 30, index = 15)
     private Integer examOrder;
+
     /**
      * 是否为重考
      */
     private Boolean isReexamine;
+
     /**
      * 是否断点续考
      */
     private Boolean isContinued;
+
     /**
      * 断点续考次数
      */
     @ExcelProperty(name = "断点续考次数", width = 30, index = 20)
     private Integer continuedCount;
+
     /**
      * 抓拍比对成功次数
      */
     @ExcelProperty(name = "成功次数", width = 30, index = 18)
     private Integer faceSuccessCount;
+
     /**
      * 抓拍比对失败次数
      */
     private Integer faceFailedCount;
+
     /**
      * 抓拍存在陌生人的次数
      */
     private Integer faceStrangerCount;
+
     /**
      * 抓拍比对总次数
      */
     @ExcelProperty(name = "校验次数", width = 30, index = 17)
     private Integer faceTotalCount;
+
     /**
      * 抓拍比对成功比率
      */
     @ExcelProperty(name = "成功率", width = 30, index = 19)
     private Double faceSuccessPercent;
+
     /**
      * 活体检测结果
      */
     private String faceVerifyResult;
-    
+
     private IsSuccess faceVerifyResultValue;
+
     /**
      * 人脸五官坐标比对值
      */
     private Double faceLandmarkVal;
+
     /**
      * 百度人脸活体检测通过率
      */
     private Double baiduFaceLivenessSuccessPercent;
+
     /**
      * 卷面总分
      */
     @ExcelProperty(name = "卷面总分", width = 30, index = 24)
     private String paperTotalScore;
+
     /**
      * 是否提交试卷
      */
     @ExcelProperty(name = "是否提交交卷", width = 30, index = 27)
     private String isSubmit;
+
     /**
      * 考试交卷时间
      */
     @ExcelProperty(name = "考试交卷时间", width = 30, index = 9)
     private String paperSubmitTime;
+
     /**
      * 客观题总分
      */
     @ExcelProperty(name = "客观题总分", width = 30, index = 22)
     private String objectiveTotalScore;
+
     /**
      * 主观题总分
      */
     @ExcelProperty(name = "主观题总分", width = 30, index = 23)
     private String subjectiveTotalScore;
+
     /**
      * 违纪标志
      */
     @ExcelProperty(name = "违纪标志", width = 30, index = 25)
     private String disciplineSign;
+
     /**
      * 学生电话
      */
@@ -686,46 +740,46 @@ public class ExamRecordInfo implements JsonSerializable {
         this.paperStartTime = paperStartTime;
     }
 
-	public Boolean getIsWarn() {
-		return isWarn;
-	}
+    public Boolean getIsWarn() {
+        return isWarn;
+    }
 
-	public void setIsWarn(Boolean isWarn) {
-		this.isWarn = isWarn;
-	}
+    public void setIsWarn(Boolean isWarn) {
+        this.isWarn = isWarn;
+    }
 
-	public Boolean getIsAudit() {
-		return isAudit;
-	}
+    public Boolean getIsAudit() {
+        return isAudit;
+    }
 
-	public void setIsAudit(Boolean isAudit) {
-		this.isAudit = isAudit;
-	}
+    public void setIsAudit(Boolean isAudit) {
+        this.isAudit = isAudit;
+    }
 
-	public Boolean getIsReexamine() {
-		return isReexamine;
-	}
+    public Boolean getIsReexamine() {
+        return isReexamine;
+    }
 
-	public void setIsReexamine(Boolean isReexamine) {
-		this.isReexamine = isReexamine;
-	}
+    public void setIsReexamine(Boolean isReexamine) {
+        this.isReexamine = isReexamine;
+    }
 
-	public Boolean getIsContinued() {
-		return isContinued;
-	}
+    public Boolean getIsContinued() {
+        return isContinued;
+    }
 
-	public void setIsContinued(Boolean isContinued) {
-		this.isContinued = isContinued;
-	}
+    public void setIsContinued(Boolean isContinued) {
+        this.isContinued = isContinued;
+    }
 
-	public Double getBaiduFaceLivenessSuccessPercent() {
-		return baiduFaceLivenessSuccessPercent;
-	}
+    public Double getBaiduFaceLivenessSuccessPercent() {
+        return baiduFaceLivenessSuccessPercent;
+    }
 
-	public void setBaiduFaceLivenessSuccessPercent(
-			Double baiduFaceLivenessSuccessPercent) {
-		this.baiduFaceLivenessSuccessPercent = baiduFaceLivenessSuccessPercent;
-	}
+    public void setBaiduFaceLivenessSuccessPercent(
+            Double baiduFaceLivenessSuccessPercent) {
+        this.baiduFaceLivenessSuccessPercent = baiduFaceLivenessSuccessPercent;
+    }
 
     public List<ExamRecordFileAnswerInfo> getOfflineFiles() {
         return offlineFiles;
@@ -752,37 +806,37 @@ public class ExamRecordInfo implements JsonSerializable {
         this.ip = ip;
     }
 
-	public ExamType getExamTypeValue() {
-		return examTypeValue;
-	}
+    public ExamType getExamTypeValue() {
+        return examTypeValue;
+    }
 
-	public void setExamTypeValue(ExamType examTypeValue) {
-		this.examTypeValue = examTypeValue;
-	}
+    public void setExamTypeValue(ExamType examTypeValue) {
+        this.examTypeValue = examTypeValue;
+    }
 
-	public Boolean getIsIllegalityValue() {
-		return isIllegalityValue;
-	}
+    public Boolean getIsIllegalityValue() {
+        return isIllegalityValue;
+    }
 
-	public void setIsIllegalityValue(Boolean isIllegalityValue) {
-		this.isIllegalityValue = isIllegalityValue;
-	}
+    public void setIsIllegalityValue(Boolean isIllegalityValue) {
+        this.isIllegalityValue = isIllegalityValue;
+    }
 
-	public ExamRecordStatus getExamRecordStatusValue() {
-		return examRecordStatusValue;
-	}
+    public ExamRecordStatus getExamRecordStatusValue() {
+        return examRecordStatusValue;
+    }
 
-	public void setExamRecordStatusValue(ExamRecordStatus examRecordStatusValue) {
-		this.examRecordStatusValue = examRecordStatusValue;
-	}
+    public void setExamRecordStatusValue(ExamRecordStatus examRecordStatusValue) {
+        this.examRecordStatusValue = examRecordStatusValue;
+    }
 
-	public IsSuccess getFaceVerifyResultValue() {
-		return faceVerifyResultValue;
-	}
+    public IsSuccess getFaceVerifyResultValue() {
+        return faceVerifyResultValue;
+    }
 
-	public void setFaceVerifyResultValue(IsSuccess faceVerifyResultValue) {
-		this.faceVerifyResultValue = faceVerifyResultValue;
-	}
+    public void setFaceVerifyResultValue(IsSuccess faceVerifyResultValue) {
+        this.faceVerifyResultValue = faceVerifyResultValue;
+    }
 
     public String getAuditUserName() {
         return auditUserName;
@@ -799,4 +853,5 @@ public class ExamRecordInfo implements JsonSerializable {
     public void setHasVirtual(Boolean hasVirtual) {
         this.hasVirtual = hasVirtual;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamRecordQuery.java

@@ -7,16 +7,14 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import com.alibaba.fastjson.JSON;
-import org.apache.commons.lang3.StringUtils;
-
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 考试记录查询条件类
@@ -35,55 +33,79 @@ public class ExamRecordQuery implements JsonSerializable {
 
     @ApiModelProperty("当前页数")
     private Integer pageNo;
+
     @ApiModelProperty("每页条数")
     private Integer pageSize;
+
     @ApiModelProperty("学习中心ID")
     private Long orgId;
+
     @ApiModelProperty("考试ID")
     private Long examId;
+
     @ApiModelProperty("场次ID")
     private Long examStageId;
+
     @ApiModelProperty("学号")
     private String studentCode;
+
     @ApiModelProperty("学生姓名")
     private String studentName;
+
     @ApiModelProperty("身份证号")
     private String identityNumber;
+
     @ApiModelProperty("课程ID")
     private Long courseId;
+
     @ApiModelProperty("课程层次")
     private String courseLevel;
+
     @ApiModelProperty("考试记录ID")
     private Long examRecordId;
+
     @ApiModelProperty("审核状态")
     private Boolean isAudit;
+
     @ApiModelProperty("是否需要审核")
     private Boolean isWarn;
+
     @ApiModelProperty("是否有陌生人脸")
     private Boolean hasStranger;
+
     @ApiModelProperty("人脸识别成功率下限")
     private Double faceSuccessPercentLower;
+
     @ApiModelProperty("人脸识别成功率上限")
     private Double faceSuccessPercentUpper;
+
     @ApiModelProperty("人脸真实性比率下限")
     private Double livenessSuccessPercentLower;
+
     @ApiModelProperty("人脸真实性比率上限")
     private Double livenessSuccessPercentUpper;
+
     @ApiModelProperty("考试记录状态：EXAM_ING、EXAM_END、EXAM_OVERDUE、EXAM_INVALID")
     private List<String> recordStatuses;
+
     @ApiModelProperty("采集人")
     private String infoCollector;
+
     @ApiModelProperty("开考起始时间")
     private String startTime;
+
     @ApiModelProperty("开考截止时间")
     private String endTime;
+
     @ApiModelProperty("是否有虚拟设备")
     private Boolean hasVirtual;
+
     @ApiModelProperty("交卷起始时间")
     private String submitStartTime;
+
     @ApiModelProperty("交卷截止时间")
     private String submitEndTime;
-    
+
     @ApiModelProperty("是否违纪")
     private Boolean isIllegality;
 
@@ -240,22 +262,22 @@ public class ExamRecordQuery implements JsonSerializable {
     }
 
     public Double getLivenessSuccessPercentLower() {
-		return livenessSuccessPercentLower;
-	}
+        return livenessSuccessPercentLower;
+    }
 
-	public void setLivenessSuccessPercentLower(Double livenessSuccessPercentLower) {
-		this.livenessSuccessPercentLower = livenessSuccessPercentLower;
-	}
+    public void setLivenessSuccessPercentLower(Double livenessSuccessPercentLower) {
+        this.livenessSuccessPercentLower = livenessSuccessPercentLower;
+    }
 
-	public Double getLivenessSuccessPercentUpper() {
-		return livenessSuccessPercentUpper;
-	}
+    public Double getLivenessSuccessPercentUpper() {
+        return livenessSuccessPercentUpper;
+    }
 
-	public void setLivenessSuccessPercentUpper(Double livenessSuccessPercentUpper) {
-		this.livenessSuccessPercentUpper = livenessSuccessPercentUpper;
-	}
+    public void setLivenessSuccessPercentUpper(Double livenessSuccessPercentUpper) {
+        this.livenessSuccessPercentUpper = livenessSuccessPercentUpper;
+    }
 
-	public String getInfoCollector() {
+    public String getInfoCollector() {
         return infoCollector;
     }
 
@@ -279,29 +301,29 @@ public class ExamRecordQuery implements JsonSerializable {
         this.endTime = endTime;
     }
 
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
 
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
 
-	public Boolean getIsAudit() {
-		return isAudit;
-	}
+    public Boolean getIsAudit() {
+        return isAudit;
+    }
 
-	public void setIsAudit(Boolean isAudit) {
-		this.isAudit = isAudit;
-	}
+    public void setIsAudit(Boolean isAudit) {
+        this.isAudit = isAudit;
+    }
 
-	public Boolean getIsWarn() {
-		return isWarn;
-	}
+    public Boolean getIsWarn() {
+        return isWarn;
+    }
 
-	public void setIsWarn(Boolean isWarn) {
-		this.isWarn = isWarn;
-	}
+    public void setIsWarn(Boolean isWarn) {
+        this.isWarn = isWarn;
+    }
 
 
     public Boolean getHasVirtual() {
@@ -337,13 +359,13 @@ public class ExamRecordQuery implements JsonSerializable {
         this.submitEndTime = submitEndTime;
     }
 
-	public Long getCreator() {
-		return creator;
-	}
+    public Long getCreator() {
+        return creator;
+    }
 
-	public void setCreator(Long creator) {
-		this.creator = creator;
-	}
+    public void setCreator(Long creator) {
+        this.creator = creator;
+    }
 
     public Boolean getIsIllegality() {
         return isIllegality;
@@ -368,4 +390,5 @@ public class ExamRecordQuery implements JsonSerializable {
     public void setAuditUserName(String auditUserName) {
         this.auditUserName = auditUserName;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examrecord/ExamStudentQuestionScoreInfo.java

@@ -1,126 +1,155 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord;
+
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 import cn.com.qmth.examcloud.support.excel.ExcelProperty;
+
 /**
- * 
  * @author lideyin
  * @date 2019年3月14日 下午2:37:57
  * @description 考生作答得分详情
  */
 public class ExamStudentQuestionScoreInfo implements JsonSerializable {
 
-	private static final long serialVersionUID = -735354116432038902L;
-	/**
+    private static final long serialVersionUID = -735354116432038902L;
+
+    /**
      * 考试记录ID
      */
-	@ExcelProperty(name = "考试记录ID", width = 30, index = 1)
-	private Long examRecordDataId;
+    @ExcelProperty(name = "考试记录ID", width = 30, index = 1)
+    private Long examRecordDataId;
+
     /**
      * 课程代码
      */
-	@ExcelProperty(name = "课程代码", width = 30, index = 2)
-	private String courseCode;
+    @ExcelProperty(name = "课程代码", width = 30, index = 2)
+    private String courseCode;
+
     /**
      * 课程名称
      */
-	@ExcelProperty(name = "课程名称", width = 30, index = 3)
-	private String courseName;
+    @ExcelProperty(name = "课程名称", width = 30, index = 3)
+    private String courseName;
+
     /**
      * 考试名称
      */
-	@ExcelProperty(name = "考试名称", width = 30, index = 4)
-	private String examName;
-   /**
-    * 学号
-    */
-	@ExcelProperty(name = "学号", width = 30, index = 5)
-	private String studentCode;
+    @ExcelProperty(name = "考试名称", width = 30, index = 4)
+    private String examName;
+
+    /**
+     * 学号
+     */
+    @ExcelProperty(name = "学号", width = 30, index = 5)
+    private String studentCode;
+
     /**
      * 原始试卷Id
      */
-	@ExcelProperty(name = "原始试卷Id", width = 30, index = 6)
-	private String basePaperId;
+    @ExcelProperty(name = "原始试卷Id", width = 30, index = 6)
+    private String basePaperId;
+
     /**
      * 大题号
      */
-	@ExcelProperty(name = "大题号", width = 30, index = 7)
-	private Integer mainNumber;
+    @ExcelProperty(name = "大题号", width = 30, index = 7)
+    private Integer mainNumber;
+
     /**
      * 顺序/小题号
      */
-	@ExcelProperty(name = "小题号", width = 30, index = 8)
-	private Integer order;
+    @ExcelProperty(name = "小题号", width = 30, index = 8)
+    private Integer order;
+
     /**
      * 每题得分
      */
-	@ExcelProperty(name = "每题得分", width = 30, index = 9)
-	private Double studentScore;
+    @ExcelProperty(name = "每题得分", width = 30, index = 9)
+    private Double studentScore;
+
     /**
      * 考生作答
      */
-	@ExcelProperty(name = "考生作答", width = 30, index = 10)
-	private String studentAnswer;
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
-	public String getCourseCode() {
-		return courseCode;
-	}
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-	
-	public String getExamName() {
-		return examName;
-	}
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-	public String getStudentCode() {
-		return studentCode;
-	}
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-	
-	public String getCourseName() {
-		return courseName;
-	}
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-	public String getBasePaperId() {
-		return basePaperId;
-	}
-	public void setBasePaperId(String basePaperId) {
-		this.basePaperId = basePaperId;
-	}
-	public Integer getMainNumber() {
-		return mainNumber;
-	}
-	public void setMainNumber(Integer mainNumber) {
-		this.mainNumber = mainNumber;
-	}
-	public Integer getOrder() {
-		return order;
-	}
-	public void setOrder(Integer order) {
-		this.order = order;
-	}
-	public Double getStudentScore() {
-		return studentScore;
-	}
-	public void setStudentScore(Double studentScore) {
-		this.studentScore = studentScore;
-	}
-	public String getStudentAnswer() {
-		return studentAnswer;
-	}
-	public void setStudentAnswer(String studentAnswer) {
-		this.studentAnswer = studentAnswer;
-	}
-    
+    @ExcelProperty(name = "考生作答", width = 30, index = 10)
+    private String studentAnswer;
+
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
+
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getBasePaperId() {
+        return basePaperId;
+    }
+
+    public void setBasePaperId(String basePaperId) {
+        this.basePaperId = basePaperId;
+    }
+
+    public Integer getMainNumber() {
+        return mainNumber;
+    }
+
+    public void setMainNumber(Integer mainNumber) {
+        this.mainNumber = mainNumber;
+    }
+
+    public Integer getOrder() {
+        return order;
+    }
+
+    public void setOrder(Integer order) {
+        this.order = order;
+    }
+
+    public Double getStudentScore() {
+        return studentScore;
+    }
+
+    public void setStudentScore(Double studentScore) {
+        this.studentScore = studentScore;
+    }
+
+    public String getStudentAnswer() {
+        return studentAnswer;
+    }
+
+    public void setStudentAnswer(String studentAnswer) {
+        this.studentAnswer = studentAnswer;
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examscore/ExamScoreEntityConvert.java

@@ -29,10 +29,10 @@ public class ExamScoreEntityConvert {
         studentQuery.setIdentityNumber(scoreQuery.getIdentityNumber());
         studentQuery.setCourseId(scoreQuery.getCourseId());
         studentQuery.setCourseLevel(scoreQuery.getCourseLevel());
-        if(scoreQuery.getFinished()!=null){
-        	studentQuery.setFinished(scoreQuery.getFinished()?1:0);
-        }else{
-        	studentQuery.setFinished(null);
+        if (scoreQuery.getFinished() != null) {
+            studentQuery.setFinished(scoreQuery.getFinished() ? 1 : 0);
+        } else {
+            studentQuery.setFinished(null);
         }
         studentQuery.setStartLimit(scoreQuery.getStartLimit());
         studentQuery.setEndLimit(scoreQuery.getEndLimit());

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examscore/ExamScoreInfo.java

@@ -17,99 +17,118 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
  * @since: 2018/8/31
  */
 public class ExamScoreInfo implements JsonSerializable {
+
     /**
      * 考试ID
      */
     private Long examId;
+
     /**
      * 考试名称
      */
     @ExcelProperty(name = "批次名称", width = 30, index = 10)
     private String examName;
+
     /**
      * 学生ID
      */
     private Long studentId;
+
     /**
      * 学号
      */
     @ExcelProperty(name = "学号", width = 30, index = 2)
     private String studentCode;
+
     /**
      * 学生姓名
      */
     @ExcelProperty(name = "姓名", width = 30, index = 1)
     private String studentName;
+
     /**
      * 身份证号
      */
     @ExcelProperty(name = "身份证号", width = 30, index = 3)
     private String identityNumber;
+
     /**
      * 课程ID
      */
     private Long courseId;
+
     /**
      * 课程Code
      */
     @ExcelProperty(name = "课程代码", width = 30, index = 9)
     private String courseCode;
+
     /**
      * 课程名称
      */
     private String courseName;
+
     /**
      * 课程层次
      */
     @ExcelProperty(name = "层次", width = 30, index = 5)
     private String courseLevel;
+
     /**
      * 课程名称(课程代码)
      */
     @ExcelProperty(name = "课程名称(课程代码)", width = 30, index = 8)
     private String courseNameAndCode;
+
     /**
      * 学习中心ID
      */
     private Long orgId;
+
     /**
      * 学习中心代码
      */
     private String orgCode;
+
     /**
      * 学习中心名称
      */
     @ExcelProperty(name = "学习中心", width = 30, index = 4)
     private String orgName;
+
     /**
      * 专业名称
      */
     @ExcelProperty(name = "专业", width = 30, index = 7)
     private String specialtyName;
+
     /**
      * 年级
      */
     @ExcelProperty(name = "年级", width = 30, index = 6)
     private String grade;
+
     /**
      * 是否完成考试
      */
     private String isFinished;
-    
-    
+
+
     @ExcelProperty(name = "是否缺考", width = 30, index = 13)
     private String isAbsent;
-    
+
     /**
      * 最终成绩
      */
     @ExcelProperty(name = "考试最终成绩", width = 30, index = 17)
     private String finalExamScore;
+
     /**
      * 客观题得分总分
      */
     @ExcelProperty(name = "客观题得分", width = 30, index = 15)
     private String objectiveScore;
+
     /**
      * 主观题得分总分
      */
@@ -121,27 +140,31 @@ public class ExamScoreInfo implements JsonSerializable {
      */
     @ExcelProperty(name = "违纪次数", width = 30, index = 11)
     private String disciplineCount;
+
     /**
      * 正常提交试卷次数
      */
     @ExcelProperty(name = "正常提交试卷次数", width = 30, index = 12)
     private String submitCount;
+
     /**
      * 考试开始时间
      */
     @ExcelProperty(name = "成绩统计时间", width = 31, index = 14)
     private String startTime;
-    
+
     /**
      * 剩余考试次数
      */
     @ExcelProperty(name = "剩余考试次数", width = 31, index = 19)
     private Long leftExamTimes;
+
     /**
      * 采集人
      */
     @ExcelProperty(name = "采集人", width = 30, index = 18)
     private String infoCollector;
+
     public Long getExamId() {
         return examId;
     }
@@ -310,29 +333,29 @@ public class ExamScoreInfo implements JsonSerializable {
         this.startTime = startTime;
     }
 
-	public String getIsAbsent() {
-		return isAbsent;
-	}
+    public String getIsAbsent() {
+        return isAbsent;
+    }
 
-	public void setIsAbsent(String isAbsent) {
-		this.isAbsent = isAbsent;
-	}
+    public void setIsAbsent(String isAbsent) {
+        this.isAbsent = isAbsent;
+    }
 
-	public Long getLeftExamTimes() {
-		return leftExamTimes;
-	}
+    public Long getLeftExamTimes() {
+        return leftExamTimes;
+    }
 
-	public void setLeftExamTimes(Long leftExamTimes) {
-		this.leftExamTimes = leftExamTimes;
-	}
+    public void setLeftExamTimes(Long leftExamTimes) {
+        this.leftExamTimes = leftExamTimes;
+    }
 
-	public String getInfoCollector() {
-		return infoCollector;
-	}
+    public String getInfoCollector() {
+        return infoCollector;
+    }
 
-	public void setInfoCollector(String infoCollector) {
-		this.infoCollector = infoCollector;
-	}
+    public void setInfoCollector(String infoCollector) {
+        this.infoCollector = infoCollector;
+    }
 
     public String getObjectiveScore() {
         return objectiveScore;
@@ -349,4 +372,5 @@ public class ExamScoreInfo implements JsonSerializable {
     public void setSubjectiveScore(String subjectiveScore) {
         this.subjectiveScore = subjectiveScore;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examscore/ExamScoreQuery.java

@@ -53,7 +53,7 @@ public class ExamScoreQuery implements JsonSerializable {
 
     @ApiModelProperty("创建人ID")
     private Long creator;
-    
+
     public Long getRootOrgId() {
         return rootOrgId;
     }
@@ -166,13 +166,13 @@ public class ExamScoreQuery implements JsonSerializable {
         this.examStageId = examStageId;
     }
 
-	public Long getCreator() {
-		return creator;
-	}
+    public Long getCreator() {
+        return creator;
+    }
+
+    public void setCreator(Long creator) {
+        this.creator = creator;
+    }
+
 
-	public void setCreator(Long creator) {
-		this.creator = creator;
-	}
-    
-    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examscore/ObjectiveScoreInfo.java

@@ -1,125 +1,125 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore;
 
 
-import java.util.Date;
-
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
+import java.util.Date;
+
 /**
- * 
- * @author  	chenken
- * @date    	2018年9月27日 下午3:45:58
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年9月27日 下午3:45:58
+ * @company QMTH
  * @description 客观分信息
  */
-public class ObjectiveScoreInfo implements JsonSerializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 3722050952090373601L;
-
-	/**
-	 * 考试记录ID
-	 */
-	private Long examRecordDataId;
-	
-	/**
-	 * 客观分总分
-	 */
-	private Double objectiveScore;
-	
-	/**
-	 * 第几次考
-	 */
-	private Integer examOrder;
-	
-	/**
-	 * 开始时间
-	 */
-	private Date startTime;
-	
-	/**
-	 * 交卷时间
-	 */
-	private Date endTime;
-	
-	/**
-	 * 是否待审核
-	 */
-	private Boolean isAuditing;
-	
-	/**
-	 * 是否违纪
-	 */
-	private Boolean isIllegality;
-
-	/**
-	 * 考试是否已结束
-	 */
-	private Boolean isExamEnded;
-
-	public Long getExamRecordDataId() {
-		return examRecordDataId;
-	}
-
-	public void setExamRecordDataId(Long examRecordDataId) {
-		this.examRecordDataId = examRecordDataId;
-	}
-
-	public Double getObjectiveScore() {
-		return objectiveScore;
-	}
-
-	public void setObjectiveScore(Double objectiveScore) {
-		this.objectiveScore = objectiveScore;
-	}
-
-	public Integer getExamOrder() {
-		return examOrder;
-	}
-
-	public void setExamOrder(Integer examOrder) {
-		this.examOrder = examOrder;
-	}
-
-	public Date getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-
-	public Boolean getIsAuditing() {
-		return isAuditing;
-	}
-
-	public void setIsAuditing(Boolean isAuditing) {
-		this.isAuditing = isAuditing;
-	}
-
-	public Boolean getIsIllegality() {
-		return isIllegality;
-	}
-
-	public void setIsIllegality(Boolean isIllegality) {
-		this.isIllegality = isIllegality;
-	}
-
-	public Boolean getIsExamEnded() {
-		return isExamEnded;
-	}
-
-	public void setIsExamEnded(Boolean examEnded) {
-		isExamEnded = examEnded;
-	}
+public class ObjectiveScoreInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 3722050952090373601L;
+
+    /**
+     * 考试记录ID
+     */
+    private Long examRecordDataId;
+
+    /**
+     * 客观分总分
+     */
+    private Double objectiveScore;
+
+    /**
+     * 第几次考
+     */
+    private Integer examOrder;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 交卷时间
+     */
+    private Date endTime;
+
+    /**
+     * 是否待审核
+     */
+    private Boolean isAuditing;
+
+    /**
+     * 是否违纪
+     */
+    private Boolean isIllegality;
+
+    /**
+     * 考试是否已结束
+     */
+    private Boolean isExamEnded;
+
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
+
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
+
+    public Double getObjectiveScore() {
+        return objectiveScore;
+    }
+
+    public void setObjectiveScore(Double objectiveScore) {
+        this.objectiveScore = objectiveScore;
+    }
+
+    public Integer getExamOrder() {
+        return examOrder;
+    }
+
+    public void setExamOrder(Integer examOrder) {
+        this.examOrder = examOrder;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public Boolean getIsAuditing() {
+        return isAuditing;
+    }
+
+    public void setIsAuditing(Boolean isAuditing) {
+        this.isAuditing = isAuditing;
+    }
+
+    public Boolean getIsIllegality() {
+        return isIllegality;
+    }
+
+    public void setIsIllegality(Boolean isIllegality) {
+        this.isIllegality = isIllegality;
+    }
+
+    public Boolean getIsExamEnded() {
+        return isExamEnded;
+    }
+
+    public void setIsExamEnded(Boolean examEnded) {
+        isExamEnded = examEnded;
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/CourseCompleteProgressExcel.java

@@ -8,10 +8,10 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent;
 
 
-import java.io.Serializable;
-
 import cn.com.qmth.examcloud.support.excel.ExcelProperty;
 
+import java.io.Serializable;
+
 /**
  * @Description 课程完成进度
  * @Author lideyin
@@ -19,16 +19,21 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
  * @Version 1.0
  */
 public class CourseCompleteProgressExcel implements Serializable {
+
     private static final long serialVersionUID = -8556362551712685945L;
 
     @ExcelProperty(name = "课程名称", index = 1)
     private String courseName;
+
     @ExcelProperty(name = "课程代码", index = 2)
     private String courseCode;
+
     @ExcelProperty(name = "报考人数", index = 3)
     private Integer allNum;
+
     @ExcelProperty(name = "实考人数", index = 4)
     private Integer completedNum;
+
     @ExcelProperty(name = "完成比率", index = 5)
     private Double completedProportion;
 
@@ -71,4 +76,5 @@ public class CourseCompleteProgressExcel implements Serializable {
     public void setCompletedProportion(Double completedProportion) {
         this.completedProportion = completedProportion;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/CourseProgressInfo.java

@@ -4,97 +4,96 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 
 /**
- * 
- * @author  	chenken
- * @date    	2018年10月25日 下午2:46:03
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年10月25日 下午2:46:03
+ * @company QMTH
  * @description 课程进度
  */
 public class CourseProgressInfo implements JsonSerializable {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 5188606307210455329L;
-
-	private Long examId;
-	
-	private Long courseId;
-	
-	private String courseCode;
-	
-	private String courseName;
-	
-	private Integer completedNum;
-	
-	private Integer noCompletedNum;
-	
-	private Integer allNum;
-	
-	private Double completedProportion;
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public Integer getCompletedNum() {
-		return completedNum;
-	}
-
-	public void setCompletedNum(Integer completedNum) {
-		this.completedNum = completedNum;
-	}
-
-	public Integer getNoCompletedNum() {
-		return noCompletedNum;
-	}
-
-	public void setNoCompletedNum(Integer noCompletedNum) {
-		this.noCompletedNum = noCompletedNum;
-	}
-
-	public Integer getAllNum() {
-		return allNum;
-	}
-
-	public void setAllNum(Integer allNum) {
-		this.allNum = allNum;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public Double getCompletedProportion() {
-		return completedProportion;
-	}
-
-	public void setCompletedProportion(Double completedProportion) {
-		this.completedProportion = completedProportion;
-	}
-	
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 5188606307210455329L;
+
+    private Long examId;
+
+    private Long courseId;
+
+    private String courseCode;
+
+    private String courseName;
+
+    private Integer completedNum;
+
+    private Integer noCompletedNum;
+
+    private Integer allNum;
+
+    private Double completedProportion;
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Integer getCompletedNum() {
+        return completedNum;
+    }
+
+    public void setCompletedNum(Integer completedNum) {
+        this.completedNum = completedNum;
+    }
+
+    public Integer getNoCompletedNum() {
+        return noCompletedNum;
+    }
+
+    public void setNoCompletedNum(Integer noCompletedNum) {
+        this.noCompletedNum = noCompletedNum;
+    }
+
+    public Integer getAllNum() {
+        return allNum;
+    }
+
+    public void setAllNum(Integer allNum) {
+        this.allNum = allNum;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public Double getCompletedProportion() {
+        return completedProportion;
+    }
+
+    public void setCompletedProportion(Double completedProportion) {
+        this.completedProportion = completedProportion;
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentBean.java

@@ -5,307 +5,308 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 public class ExamStudentBean implements JsonSerializable {
 
 
-	/**
+    /**
      *
      */
     private static final long serialVersionUID = -205239358290227432L;
 
     /**
-	 * 不做业务字段使用
-	 */
-	private Long id;
-
-	/**
-	 * 考生ID(与考务的考生ID一致) 跟其他表关联使用
-	 */
-	private Long examStudentId;
-
-	/**
-	 * 考试ID
-	 */
-	private Long examId;
-
-	/**
-	 * 学生ID
-	 */
-	private Long studentId;
-
-	/**
-	 * 学号
-	 */
-	private String studentCode;
-
-	/**
-	 * 学生姓名
-	 */
-	private String studentName;
-
-	/**
-	 * 身份证号
-	 */
-	private String identityNumber;
-
-	/**
-	 * 课程ID
-	 */
-	private Long courseId;
-
-	/**
-	 * 课程Code
-	 */
-	private String courseCode;
-
-	/**
-	 * 课程层次
-	 */
-	private String courseLevel;
-
-	/**
-	 * 学习中心ID
-	 */
-	private Long orgId;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 专业code
-	 */
-	private String specialtyCode;
-
-	/**
-	 * 专业名称
-	 */
-	private String specialtyName;
-
-	/**
-	 * 试卷类型
-	 */
-	private String paperType;
-
-	/**
-	 * 采集人
-	 */
-	private String infoCollector;
-
-	/**
-	 * 是否完成考试
-	 */
-	private Boolean finished;
-
-	/**
-	 * 已经考试的次数
-	 */
-	private Integer usedNum;
-
-	/**
-	 * 补加的考试次数
-	 */
-	private Integer extraNum;
-
-	/**
-	 * 年级
-	 */
-	private String grade;
-
-	/**
-	 * 是否可用
-	 */
-	private Boolean enable;
-
-	/**
-	 * 场次id
-	 */
-	private Long examStageId;
-
-	/**
-	 * 场次号
-	 */
-	private Integer examStageOrder;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getExamStudentId() {
-		return examStudentId;
-	}
-
-	public void setExamStudentId(Long examStudentId) {
-		this.examStudentId = examStudentId;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getStudentName() {
-		return studentName;
-	}
-
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
+     * 不做业务字段使用
+     */
+    private Long id;
+
+    /**
+     * 考生ID(与考务的考生ID一致) 跟其他表关联使用
+     */
+    private Long examStudentId;
+
+    /**
+     * 考试ID
+     */
+    private Long examId;
+
+    /**
+     * 学生ID
+     */
+    private Long studentId;
+
+    /**
+     * 学号
+     */
+    private String studentCode;
+
+    /**
+     * 学生姓名
+     */
+    private String studentName;
+
+    /**
+     * 身份证号
+     */
+    private String identityNumber;
+
+    /**
+     * 课程ID
+     */
+    private Long courseId;
+
+    /**
+     * 课程Code
+     */
+    private String courseCode;
+
+    /**
+     * 课程层次
+     */
+    private String courseLevel;
+
+    /**
+     * 学习中心ID
+     */
+    private Long orgId;
+
+    /**
+     * 顶级机构ID
+     */
+    private Long rootOrgId;
+
+    /**
+     * 专业code
+     */
+    private String specialtyCode;
+
+    /**
+     * 专业名称
+     */
+    private String specialtyName;
+
+    /**
+     * 试卷类型
+     */
+    private String paperType;
+
+    /**
+     * 采集人
+     */
+    private String infoCollector;
+
+    /**
+     * 是否完成考试
+     */
+    private Boolean finished;
+
+    /**
+     * 已经考试的次数
+     */
+    private Integer usedNum;
+
+    /**
+     * 补加的考试次数
+     */
+    private Integer extraNum;
+
+    /**
+     * 年级
+     */
+    private String grade;
+
+    /**
+     * 是否可用
+     */
+    private Boolean enable;
+
+    /**
+     * 场次id
+     */
+    private Long examStageId;
+
+    /**
+     * 场次号
+     */
+    private Integer examStageOrder;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
+
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
+
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseLevel() {
+        return courseLevel;
+    }
+
+    public void setCourseLevel(String courseLevel) {
+        this.courseLevel = courseLevel;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public String getSpecialtyCode() {
+        return specialtyCode;
+    }
 
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getSpecialtyCode() {
-		return specialtyCode;
-	}
+    public void setSpecialtyCode(String specialtyCode) {
+        this.specialtyCode = specialtyCode;
+    }
 
-	public void setSpecialtyCode(String specialtyCode) {
-		this.specialtyCode = specialtyCode;
-	}
+    public String getSpecialtyName() {
+        return specialtyName;
+    }
 
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
+    public void setSpecialtyName(String specialtyName) {
+        this.specialtyName = specialtyName;
+    }
 
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
+    public String getPaperType() {
+        return paperType;
+    }
 
-	public String getPaperType() {
-		return paperType;
-	}
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
 
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
-	}
+    public String getInfoCollector() {
+        return infoCollector;
+    }
 
-	public String getInfoCollector() {
-		return infoCollector;
-	}
+    public void setInfoCollector(String infoCollector) {
+        this.infoCollector = infoCollector;
+    }
 
-	public void setInfoCollector(String infoCollector) {
-		this.infoCollector = infoCollector;
-	}
+    public Boolean getFinished() {
+        return finished;
+    }
 
-	public Boolean getFinished() {
-		return finished;
-	}
+    public void setFinished(Boolean finished) {
+        this.finished = finished;
+    }
 
-	public void setFinished(Boolean finished) {
-		this.finished = finished;
-	}
+    public Integer getUsedNum() {
+        return usedNum;
+    }
 
-	public Integer getUsedNum() {
-		return usedNum;
-	}
+    public void setUsedNum(Integer usedNum) {
+        this.usedNum = usedNum;
+    }
 
-	public void setUsedNum(Integer usedNum) {
-		this.usedNum = usedNum;
-	}
+    public Integer getExtraNum() {
+        return extraNum;
+    }
 
-	public Integer getExtraNum() {
-		return extraNum;
-	}
+    public void setExtraNum(Integer extraNum) {
+        this.extraNum = extraNum;
+    }
 
-	public void setExtraNum(Integer extraNum) {
-		this.extraNum = extraNum;
-	}
+    public String getGrade() {
+        return grade;
+    }
 
-	public String getGrade() {
-		return grade;
-	}
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
 
-	public void setGrade(String grade) {
-		this.grade = grade;
-	}
+    public Boolean getEnable() {
+        return enable;
+    }
 
-	public Boolean getEnable() {
-		return enable;
-	}
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
 
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
+    public Long getExamStageId() {
+        return examStageId;
+    }
 
-	public Long getExamStageId() {
-		return examStageId;
-	}
+    public void setExamStageId(Long examStageId) {
+        this.examStageId = examStageId;
+    }
 
-	public void setExamStageId(Long examStageId) {
-		this.examStageId = examStageId;
-	}
+    public Integer getExamStageOrder() {
+        return examStageOrder;
+    }
 
-	public Integer getExamStageOrder() {
-		return examStageOrder;
-	}
+    public void setExamStageOrder(Integer examStageOrder) {
+        this.examStageOrder = examStageOrder;
+    }
 
-	public void setExamStageOrder(Integer examStageOrder) {
-		this.examStageOrder = examStageOrder;
-	}
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentEntityConvert.java

@@ -7,24 +7,22 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent;
 
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
+import com.google.common.collect.Lists;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 
-import com.google.common.collect.Lists;
-
-import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 类信息转换
@@ -254,4 +252,5 @@ public class ExamStudentEntityConvert {
 
         return resultList;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentExcel.java

@@ -8,10 +8,10 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent;
 
 
-import java.io.Serializable;
-
 import cn.com.qmth.examcloud.support.excel.ExcelProperty;
 
+import java.io.Serializable;
+
 /**
  * 考生信息-Excel格式
  *
@@ -19,24 +19,34 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
  * @since: 2018/8/30
  */
 public class ExamStudentExcel implements Serializable {
+
     @ExcelProperty(name = "学号", index = 1)
     private String studentCode;
+
     @ExcelProperty(name = "考生姓名", index = 2)
     private String studentName;
+
     @ExcelProperty(name = "身份证号", index = 3)
     private String identityNumber;
+
     @ExcelProperty(name = "学生电话", index = 4)
     private String phone;
+
     @ExcelProperty(name = "年级", index = 5)
     private String grade;
+
     @ExcelProperty(name = "采集人", index = 6)
     private String infoCollector;
+
     @ExcelProperty(name = "课程代码", index = 7)
     private String courseCode;
+
     @ExcelProperty(name = "课程", index = 8)
     private String courseName;
+
     @ExcelProperty(name = "学习中心", index = 9)
     private String orgName;
+
     @ExcelProperty(name = "完成状态", index = 10)
     private String finished;
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentFinishedStatistic.java

@@ -16,10 +16,12 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @since: 2018/8/30
  */
 public class ExamStudentFinishedStatistic implements JsonSerializable {
+
     /**
      * 完成数
      */
     private Integer finished;
+
     /**
      * 未完成数
      */

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentInfo.java

@@ -19,18 +19,22 @@ import java.util.List;
  * @since: 2018/8/15
  */
 public class ExamStudentInfo implements JsonSerializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -3697944484049914650L;
+
     /**
-	 *
-	 */
-	private static final long serialVersionUID = -3697944484049914650L;
-	/**
      * 主键
      */
     private Long id;
+
     /**
      * 考生ID(与考务的考生ID一致)
      */
     private Long examStudentId;
+
     /**
      * 考试ID
      */
@@ -42,66 +46,82 @@ public class ExamStudentInfo implements JsonSerializable {
      * 学生ID
      */
     private Long studentId;
+
     /**
      * 学号
      */
     private String studentCode;
+
     /**
      * 学生姓名
      */
     private String studentName;
+
     /**
      * 身份证号
      */
     private String identityNumber;
+
     /**
      * 课程ID
      */
     private Long courseId;
+
     /**
      * 课程Code
      */
     private String courseCode;
+
     /**
      * 课程名称
      */
     private String courseName;
+
     /**
      * 课程层次
      */
     private String courseLevel;
+
     /**
      * 学习中心ID
      */
     private Long orgId;
+
     /**
      * 学习中心代码
      */
     private String orgCode;
+
     /**
      * 学习中心名称
      */
     private String orgName;
+
     /**
      * 顶级机构ID
      */
     private Long rootOrgId;
+
     /**
      * 专业code
      */
     private String specialtyCode;
+
     /**
      * 专业名称
      */
     private String specialtyName;
+
     /**
      * 试卷类型
      */
     private String paperType;
+
     /**
      * 采集人
      */
     private String infoCollector;
+
     /**
      * 是否完成考试
      */
@@ -118,27 +138,31 @@ public class ExamStudentInfo implements JsonSerializable {
      * 离线考试作答文件集合
      */
     private List<ExamRecordFileAnswerInfo> offlineFiles;
+
     /**
      * 考点
      */
     private String examSiteName;
+
     /**
      * 学生电话
      */
     private String phone;
+
     /**
      * 年级
      */
     private String grade;
+
     /**
      * 是否允许上传附件
      */
     private Boolean canUploadAttachment;
 
     /**
-	 * 是否可用
-	 */
-	private Boolean enable;
+     * 是否可用
+     */
+    private Boolean enable;
 
     /**
      * 已经考试的次数
@@ -344,37 +368,37 @@ public class ExamStudentInfo implements JsonSerializable {
         this.grade = grade;
     }
 
-	public String getExamType() {
-		return examType;
-	}
+    public String getExamType() {
+        return examType;
+    }
 
-	public void setExamType(String examType) {
-		this.examType = examType;
-	}
+    public void setExamType(String examType) {
+        this.examType = examType;
+    }
 
-	public Boolean getCanUploadAttachment() {
-		return canUploadAttachment;
-	}
+    public Boolean getCanUploadAttachment() {
+        return canUploadAttachment;
+    }
 
-	public void setCanUploadAttachment(Boolean canUploadAttachment) {
-		this.canUploadAttachment = canUploadAttachment;
-	}
+    public void setCanUploadAttachment(Boolean canUploadAttachment) {
+        this.canUploadAttachment = canUploadAttachment;
+    }
 
-	public String getFinishedStatus() {
-		return finishedStatus;
-	}
+    public String getFinishedStatus() {
+        return finishedStatus;
+    }
 
-	public void setFinishedStatus(String finishedStatus) {
-		this.finishedStatus = finishedStatus;
-	}
+    public void setFinishedStatus(String finishedStatus) {
+        this.finishedStatus = finishedStatus;
+    }
 
-	public Boolean getEnable() {
-		return enable;
-	}
+    public Boolean getEnable() {
+        return enable;
+    }
 
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
 
     public Integer getUsedNum() {
         return usedNum;
@@ -415,4 +439,5 @@ public class ExamStudentInfo implements JsonSerializable {
     public void setExamStageOrder(Integer examStageOrder) {
         this.examStageOrder = examStageOrder;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentOrgStatistic.java

@@ -16,26 +16,32 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @since: 2018/8/15
  */
 public class ExamStudentOrgStatistic implements JsonSerializable {
+
     /**
      * 学习中心ID
      */
     private Long orgId;
+
     /**
      * 学习中心代码
      */
     private String orgCode;
+
     /**
      * 学习中心名称
      */
     private String orgName;
+
     /**
      * 报考人数(计划数)
      */
     private Integer totalCount;
+
     /**
      * 实考人数(完成数)
      */
     private Integer finishedCount;
+
     /**
      * 完成比率(%)
      */

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentPartInfo.java

@@ -16,18 +16,22 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  * @since: 2018/8/15
  */
 public class ExamStudentPartInfo implements JsonSerializable {
+
     /**
      * 学生ID
      */
     private Long studentId;
+
     /**
      * 学号
      */
     private String studentCode;
+
     /**
      * 学生姓名
      */
     private String studentName;
+
     /**
      * 身份证号
      */

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentQuery.java

@@ -20,35 +20,47 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel
 public class ExamStudentQuery implements JsonSerializable {
+
     /**
-	 *
-	 */
-	private static final long serialVersionUID = 4853280464208226631L;
-	
-	private Long rootOrgId;
+     *
+     */
+    private static final long serialVersionUID = 4853280464208226631L;
 
-	@ApiModelProperty("当前页数")
+    private Long rootOrgId;
+
+    @ApiModelProperty("当前页数")
     private Integer pageNo;
+
     @ApiModelProperty("每页条数")
     private Integer pageSize;
+
     @ApiModelProperty("学习中心ID")
     private Long orgId;
+
     @ApiModelProperty("考试ID")
     private Long examId;
+
     @ApiModelProperty("场次ID")
     private Long examStageId;
+
     @ApiModelProperty("学号")
     private String studentCode;
+
     @ApiModelProperty("学生姓名")
     private String studentName;
+
     @ApiModelProperty("身份证号")
     private String identityNumber;
+
     @ApiModelProperty("课程ID")
     private Long courseId;
+
     @ApiModelProperty("课程层次")
     private String courseLevel;
+
     @ApiModelProperty("是否完成考试")
     private Integer finished;
+
     @ApiModelProperty("采集人")
     private String infoCollector;
 
@@ -144,37 +156,37 @@ public class ExamStudentQuery implements JsonSerializable {
         this.finished = finished;
     }
 
-	public SelectType getSelectType() {
-		return selectType;
-	}
+    public SelectType getSelectType() {
+        return selectType;
+    }
 
-	public void setSelectType(SelectType selectType) {
-		this.selectType = selectType;
-	}
+    public void setSelectType(SelectType selectType) {
+        this.selectType = selectType;
+    }
 
-	public Integer getStartLimit() {
-		return startLimit;
-	}
+    public Integer getStartLimit() {
+        return startLimit;
+    }
 
-	public void setStartLimit(Integer startLimit) {
-		this.startLimit = startLimit;
-	}
+    public void setStartLimit(Integer startLimit) {
+        this.startLimit = startLimit;
+    }
 
-	public Integer getEndLimit() {
-		return endLimit;
-	}
+    public Integer getEndLimit() {
+        return endLimit;
+    }
 
-	public void setEndLimit(Integer endLimit) {
-		this.endLimit = endLimit;
-	}
+    public void setEndLimit(Integer endLimit) {
+        this.endLimit = endLimit;
+    }
 
-	public String getInfoCollector() {
-		return infoCollector;
-	}
+    public String getInfoCollector() {
+        return infoCollector;
+    }
 
-	public void setInfoCollector(String infoCollector) {
-		this.infoCollector = infoCollector;
-	}
+    public void setInfoCollector(String infoCollector) {
+        this.infoCollector = infoCollector;
+    }
 
     public Boolean getIgnoreUploadOfflineAnswer() {
         return ignoreUploadOfflineAnswer;
@@ -192,13 +204,13 @@ public class ExamStudentQuery implements JsonSerializable {
         this.examStageId = examStageId;
     }
 
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
 
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-    
-    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/ExamStudentUnFinishedExcel.java

@@ -17,30 +17,43 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
  * @since: 2018/8/15
  */
 public class ExamStudentUnFinishedExcel implements JsonSerializable {
+
     @ExcelProperty(name = "姓名", index = 1)
     private String studentName;
+
     @ExcelProperty(name = "学号", index = 2)
     private String studentCode;
+
     @ExcelProperty(name = "身份证号", index = 3)
     private String identityNumber;
+
     @ExcelProperty(name = "学习中心代码", index = 4)
     private String orgCode;
+
     @ExcelProperty(name = "学习中心名称", index = 5)
     private String orgName;
+
     @ExcelProperty(name = "课程代码", index = 6)
     private String courseCode;
+
     @ExcelProperty(name = "课程名称", index = 7)
     private String courseName;
+
     @ExcelProperty(name = "试卷类型", index = 8)
     private String paperType;
+
     @ExcelProperty(name = "专业名称", index = 9)
     private String specialtyName;
+
     @ExcelProperty(name = "信息采集人", index = 11)
     private String infoCollector;
+
     @ExcelProperty(name = "考点", index = 10)
     private String examSiteName;
+
     @ExcelProperty(name = "学生电话", index = 12)
     private String phone;
+
     @ExcelProperty(name = "年级", index = 13)
     private String grade;
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/examstudent/OrgCompleteProgressExcel.java

@@ -8,10 +8,10 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent;
 
 
-import java.io.Serializable;
-
 import cn.com.qmth.examcloud.support.excel.ExcelProperty;
 
+import java.io.Serializable;
+
 /**
  * @Description 学习中心完成进度
  * @Author lideyin
@@ -21,26 +21,31 @@ import cn.com.qmth.examcloud.support.excel.ExcelProperty;
 public class OrgCompleteProgressExcel implements Serializable {
 
     private static final long serialVersionUID = 122373352029233388L;
+
     /**
      * 学习中心代码
      */
     @ExcelProperty(name = "学习中心代码", index = 1)
     private String orgCode;
+
     /**
      * 学习中心名称
      */
     @ExcelProperty(name = "学习中心名称", index = 2)
     private String orgName;
+
     /**
      * 报考人数(计划数)
      */
     @ExcelProperty(name = "报考人数", index = 3)
     private Integer totalCount;
+
     /**
      * 实考人数(完成数)
      */
     @ExcelProperty(name = "实考人数", index = 4)
     private Integer finishedCount;
+
     /**
      * 完成比率(%)
      */
@@ -86,4 +91,5 @@ public class OrgCompleteProgressExcel implements Serializable {
     public void setFinishedPercent(String finishedPercent) {
         this.finishedPercent = finishedPercent;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/exporttask/ExportTask.java

@@ -17,98 +17,99 @@ import org.slf4j.LoggerFactory;
 
 public class ExportTask extends Thread {
 
-	private static final Logger log = LoggerFactory.getLogger(ExportTask.class);
+    private static final Logger log = LoggerFactory.getLogger(ExportTask.class);
 
-	private static int cacheLockTimeout = 60 * 2;
+    private static int cacheLockTimeout = 60 * 2;
 
-	private AsyncExportService asyncExportService = SpringContextHolder.getBean(AsyncExportService.class);
+    private AsyncExportService asyncExportService = SpringContextHolder.getBean(AsyncExportService.class);
 
-	private ExportTaskService exportTaskService = SpringContextHolder.getBean(ExportTaskService.class);
+    private ExportTaskService exportTaskService = SpringContextHolder.getBean(ExportTaskService.class);
 
-	private RedisClient redisClient = SpringContextHolder.getBean(RedisClient.class);
+    private RedisClient redisClient = SpringContextHolder.getBean(RedisClient.class);
 
-	@Override
-	public void run() {
-		for (;;) {
-			try {
-				log.info("ExportTask start");
-				ExportTaskEntity et = exportTaskService.findExportTaskToDispose();
-				if (et == null) {
-					log.info("ExportTask sleep 30s");
-					Util.sleep(30);
-					continue;
-				}
+    @Override
+    public void run() {
+        for (; ; ) {
+            try {
+                log.info("ExportTask start");
+                ExportTaskEntity et = exportTaskService.findExportTaskToDispose();
+                if (et == null) {
+                    log.info("ExportTask sleep 30s");
+                    Util.sleep(30);
+                    continue;
+                }
 
-				String cacheLock = "$_CACHE_LOCK:OE_EXPORT_TASK:" + et.getId();
-				Boolean lock = redisClient.setIfAbsent(cacheLock, cacheLock, cacheLockTimeout);
-				if (!lock) {
-					log.info("ExportTask lock... " + cacheLock);
-					continue;
-				}
+                String cacheLock = "$_CACHE_LOCK:OE_EXPORT_TASK:" + et.getId();
+                Boolean lock = redisClient.setIfAbsent(cacheLock, cacheLock, cacheLockTimeout);
+                if (!lock) {
+                    log.info("ExportTask lock... " + cacheLock);
+                    continue;
+                }
 
-				try {
-					exportTaskService.startExportTask(et.getId());
-					if (ExportTaskType.EXAM_DETAIL.equals(et.getType())) {
-						examRecordDetails(et);
-					} else if (ExportTaskType.SCORE_STATISTIC.equals(et.getType())) {
-						examScores(et);
-					} else if (ExportTaskType.EXAM_SCHEDULING.equals(et.getType())) {
-						examScheduling(et);
-					} else if (ExportTaskType.AUDIT.equals(et.getType())) {
-						examAudit(et);
-					}
-					exportTaskService.endExportTask(et.getId());
-				} finally {
-					redisClient.delete(cacheLock);
-				}
-				log.info("ExportTask end");
-			} catch (Exception e) {
-				log.error("ExportTask error " + e.getMessage(), e);
-			}
-		}
-	}
+                try {
+                    exportTaskService.startExportTask(et.getId());
+                    if (ExportTaskType.EXAM_DETAIL.equals(et.getType())) {
+                        examRecordDetails(et);
+                    } else if (ExportTaskType.SCORE_STATISTIC.equals(et.getType())) {
+                        examScores(et);
+                    } else if (ExportTaskType.EXAM_SCHEDULING.equals(et.getType())) {
+                        examScheduling(et);
+                    } else if (ExportTaskType.AUDIT.equals(et.getType())) {
+                        examAudit(et);
+                    }
+                    exportTaskService.endExportTask(et.getId());
+                } finally {
+                    redisClient.delete(cacheLock);
+                }
+                log.info("ExportTask end");
+            } catch (Exception e) {
+                log.error("ExportTask error " + e.getMessage(), e);
+            }
+        }
+    }
 
-	/**
-	 * 监考已审
-	 *
-	 * @param et
-	 */
-	private void examAudit(ExportTaskEntity et) {
-		ExamAuditQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamAuditQuery.class);
-		req.setRootOrgId(et.getRootOrgId());
-		asyncExportService.asyncExportExamAuditList(et.getId(), req);
-	}
+    /**
+     * 监考已审
+     *
+     * @param et
+     */
+    private void examAudit(ExportTaskEntity et) {
+        ExamAuditQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamAuditQuery.class);
+        req.setRootOrgId(et.getRootOrgId());
+        asyncExportService.asyncExportExamAuditList(et.getId(), req);
+    }
 
-	/**
-	 * 考试明细
-	 *
-	 * @param et
-	 */
-	private void examRecordDetails(ExportTaskEntity et) {
-		ExamRecordQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamRecordQuery.class);
-		req.setRootOrgId(et.getRootOrgId());
-		asyncExportService.asyncExportExamRecordDetails(et.getId(), req);
-	}
+    /**
+     * 考试明细
+     *
+     * @param et
+     */
+    private void examRecordDetails(ExportTaskEntity et) {
+        ExamRecordQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamRecordQuery.class);
+        req.setRootOrgId(et.getRootOrgId());
+        asyncExportService.asyncExportExamRecordDetails(et.getId(), req);
+    }
 
-	/**
-	 * 成绩统计
-	 *
-	 * @param et
-	 */
-	private void examScores(ExportTaskEntity et) {
-		ExamScoreQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamScoreQuery.class);
-		req.setRootOrgId(et.getRootOrgId());
-		asyncExportService.asyncExportExamScoreStatistics(et.getId(), req);
-	}
+    /**
+     * 成绩统计
+     *
+     * @param et
+     */
+    private void examScores(ExportTaskEntity et) {
+        ExamScoreQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamScoreQuery.class);
+        req.setRootOrgId(et.getRootOrgId());
+        asyncExportService.asyncExportExamScoreStatistics(et.getId(), req);
+    }
+
+    /**
+     * 考试进度
+     *
+     * @param et
+     */
+    private void examScheduling(ExportTaskEntity et) {
+        ExamStudentQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamStudentQuery.class);
+        req.setRootOrgId(et.getRootOrgId());
+        asyncExportService.asyncExportExamScheduling(et.getId(), req);
+    }
 
-	/**
-	 * 考试进度
-	 *
-	 * @param et
-	 */
-	private void examScheduling(ExportTaskEntity et) {
-		ExamStudentQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamStudentQuery.class);
-		req.setRootOrgId(et.getRootOrgId());
-		asyncExportService.asyncExportExamScheduling(et.getId(), req);
-	}
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/exporttask/ExportTaskInfo.java

@@ -34,10 +34,10 @@ public class ExportTaskInfo implements JsonSerializable {
 
     @ApiModelProperty("文件路径")
     private String filePath;
-    
+
     @ApiModelProperty("创建人ID")
     private Long creator;
-    
+
     private String jsonParams;
 
     public Long getId() {
@@ -96,22 +96,21 @@ public class ExportTaskInfo implements JsonSerializable {
         this.filePath = filePath;
     }
 
-	public Long getCreator() {
-		return creator;
-	}
+    public Long getCreator() {
+        return creator;
+    }
+
+    public void setCreator(Long creator) {
+        this.creator = creator;
+    }
+
+    public String getJsonParams() {
+        return jsonParams;
+    }
 
-	public void setCreator(Long creator) {
-		this.creator = creator;
-	}
+    public void setJsonParams(String jsonParams) {
+        this.jsonParams = jsonParams;
+    }
 
-	public String getJsonParams() {
-		return jsonParams;
-	}
 
-	public void setJsonParams(String jsonParams) {
-		this.jsonParams = jsonParams;
-	}
-    
-	
-    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/exporttask/ExportTaskListReq.java

@@ -79,4 +79,5 @@ public class ExportTaskListReq implements JsonSerializable {
     public void setExamId(Long examId) {
         this.examId = examId;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/bean/exporttask/ExportTaskListResp.java

@@ -48,12 +48,12 @@ public class ExportTaskListResp implements JsonSerializable {
 
     @ApiModelProperty("更新时间")
     private Date updateTime;
-    
+
     private String createName;
-    
+
     @ApiModelProperty("开始处理时间")
     private Date startTime;
-    
+
     @ApiModelProperty("结束处理时间")
     private Date endTime;
 
@@ -145,29 +145,29 @@ public class ExportTaskListResp implements JsonSerializable {
         this.updateTime = updateTime;
     }
 
-	public String getCreateName() {
-		return createName;
-	}
+    public String getCreateName() {
+        return createName;
+    }
 
-	public void setCreateName(String createName) {
-		this.createName = createName;
-	}
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
 
-	public Date getStartTime() {
-		return startTime;
-	}
+    public Date getStartTime() {
+        return startTime;
+    }
 
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 
-	public Date getEndTime() {
-		return endTime;
-	}
 
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-    
-    
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/cache/ExamRecordPropertyCache.java

@@ -11,35 +11,35 @@ import org.springframework.stereotype.Service;
 @Service
 public class ExamRecordPropertyCache extends RandomObjectRedisCache<ExamRecordPropertyCacheBean> {
 
-	@Autowired
-	ExamRecordDataRepo examRecordDataRepo;
-
-	@Override
-	public ExamRecordPropertyCacheBean loadFromResource(Object... keys) {
-		if(keys== null) {
-			return null;
-		}
-		Long examRecordDataId = (Long) keys[0];
-		ExamRecordDataEntity examRecordData = GlobalHelper.getEntity(examRecordDataRepo, examRecordDataId, ExamRecordDataEntity.class);
-		
-		if (null == examRecordData) {
-			return null;
-		}
-		ExamRecordPropertyCacheBean b = new ExamRecordPropertyCacheBean();
-		b.setExamId(examRecordData.getExamId());
-		b.setOrgId(examRecordData.getOrgId());
-		return b;
-	}
-
-	@Override
-	protected String getKeyPrefix() {
-		return "OE_EXAM_RECORD_PROP:";
-	}
-
-	@Override
-	protected int getTimeout() {
-		// 2分钟
-		return 60 * 2;
-	}
+    @Autowired
+    ExamRecordDataRepo examRecordDataRepo;
+
+    @Override
+    public ExamRecordPropertyCacheBean loadFromResource(Object... keys) {
+        if (keys == null) {
+            return null;
+        }
+        Long examRecordDataId = (Long) keys[0];
+        ExamRecordDataEntity examRecordData = GlobalHelper.getEntity(examRecordDataRepo, examRecordDataId, ExamRecordDataEntity.class);
+
+        if (null == examRecordData) {
+            return null;
+        }
+        ExamRecordPropertyCacheBean b = new ExamRecordPropertyCacheBean();
+        b.setExamId(examRecordData.getExamId());
+        b.setOrgId(examRecordData.getOrgId());
+        return b;
+    }
+
+    @Override
+    protected String getKeyPrefix() {
+        return "OE_EXAM_RECORD_PROP:";
+    }
+
+    @Override
+    protected int getTimeout() {
+        // 2分钟
+        return 60 * 2;
+    }
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/cache/ExamStudentCache.java

@@ -1,13 +1,11 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.cache;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
 import cn.com.qmth.examcloud.support.cache.bean.ExamStudentCacheBean;
 import cn.com.qmth.examcloud.web.cache.RandomObjectRedisCache;
-import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 @Component
 public class ExamStudentCache extends RandomObjectRedisCache<ExamStudentCacheBean> {

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/AsyncExportServiceImpl.java

@@ -5,38 +5,15 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-import cn.com.qmth.examcloud.api.commons.enums.ExamType;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamAuditService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamCaptureService;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditQuery;
-import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.JsonMapper;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExportTaskStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExportTaskType;
-import cn.com.qmth.examcloud.core.oe.admin.service.AsyncExportService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExportTaskService;
+import cn.com.qmth.examcloud.core.oe.admin.service.*;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditInfo;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreInfo;
@@ -50,9 +27,24 @@ import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
 import cn.com.qmth.examcloud.support.excel.ExcelExportUtil;
 import cn.com.qmth.examcloud.support.filestorage.FileStorageUtil;
+import cn.com.qmth.examcloud.support.helper.IdentityNumberHelper;
 import cn.com.qmth.examcloud.web.config.SystemProperties;
 import cn.com.qmth.examcloud.web.filestorage.FileStoragePathEnvInfo;
 import cn.com.qmth.examcloud.web.filestorage.YunPathInfo;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
 
 /**
  * 异步导出相关接口
@@ -60,335 +52,335 @@ import cn.com.qmth.examcloud.web.filestorage.YunPathInfo;
 @Service
 public class AsyncExportServiceImpl implements AsyncExportService {
 
-	private static final Logger LOG = LoggerFactory.getLogger(AsyncExportServiceImpl.class);
-
-	private static final String TASK_EXPORT_DIR = "task_export";
-
-	@Autowired
-	private ExportTaskService exportTaskService;
-
-	@Autowired
-	private ExamRecordService examRecordService;
-
-	@Autowired
-	private ExamScoreService examScoreService;
-
-	@Autowired
-	private SystemProperties systemConfig;
-
-	@Autowired
-	private ExamStudentService examStudentService;
-
-	@Autowired
-	private ExamAuditService examAuditService;
-
-	@Override
-	public void exportExamScheduling(String jsonParams, User user) {
-		ExamStudentQuery req = new JsonMapper().parseJson(jsonParams, ExamStudentQuery.class);
-		req.setRootOrgId(user.getRootOrgId());
-		Check.isNull(req, "请求参数不能为空！");
-		Check.isNull(req.getExamId(), "请先选择考试批次！");
-
-		// 创建导出任务
-		ExportTaskInfo task = new ExportTaskInfo();
-		task.setRootOrgId(user.getRootOrgId());
-		task.setExamId(req.getExamId());
-		task.setType(ExportTaskType.EXAM_SCHEDULING);
-		task.setStatus(ExportTaskStatus.WAITING);
-		task.setCreator(user.getUserId());
-		task.setJsonParams(jsonParams);
-		exportTaskService.addExportTask(task);
-	}
-
-	@Override
-	public void asyncExportExamScheduling(Long taskId, ExamStudentQuery req) {
-		List<ExamStudentExcel> examRecords;
-		List<ExamStudentInfo> examStudentInfoList;
-		try {
-			examStudentInfoList = examStudentService.getExamStudentInfoListForAsync(req);
-			if (CollectionUtils.isEmpty(examStudentInfoList)) {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
-				return;
-			}
-			examRecords = ExamStudentEntityConvert.ofExcel(examStudentInfoList);
-
-		} catch (Exception e) {
-			LOG.error(e.getMessage(), e);
-			if (e instanceof StatusException) {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
-						((StatusException) e).getDesc());
-			} else {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "导出数据异常");
-			}
-			return;
-		}
-		// 导出文件的存储路径
-		Long examId = examStudentInfoList.get(0).getExamId();
-		ExamSettingsCacheBean exam = CacheHelper.getExamSettings(examId);
-		final String filePath = String.format("/%s/%s/%s/%s/%s_考试进度详情.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
-				dateDir(), randomUUID(), exam.getName());
-		String tempFilePath = systemConfig.getTempDataDir() + File.separator + filePath;
-		File tempFile = new File(tempFilePath);
-		try {
-			tempFile.getParentFile().mkdirs();
-			tempFile.createNewFile();
-		} catch (IOException e) {
-			LOG.error(e.getMessage(), e);
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
-			return;
-		}
-		try (FileOutputStream out = new FileOutputStream(tempFile);) {
-
-			ExcelExportUtil.exportExcel(ExamStudentExcel.class, examRecords, out);
-
-			// 上传至文件服务器
-			FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
-			env.setRootOrgId(String.valueOf(req.getRootOrgId()));
-			env.setRelativePath(filePath);
-			YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
-
-			LOG.info("asyncExportExamScheduling finished... " + oss.getRelativePath());
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
-		} catch (Exception e) {
-			LOG.error("asyncExportExamScheduling error... " + e);
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
-		} finally {
-			FileUtils.deleteQuietly(tempFile);
-		}
-	}
-
-	@Override
-	public void exportExamRecordDetails(String jsonParams, User user) {
-		ExamRecordQuery req = new JsonMapper().parseJson(jsonParams, ExamRecordQuery.class);
-		req.setRootOrgId(user.getRootOrgId());
-		Check.isNull(req, "请求参数不能为空！");
-		Check.isNull(req.getRootOrgId(), "学校ID不能为空！");
-		Check.isNull(req.getExamId(), "考试ID不能为空！");
-		Check.isNull(req.getCreator(), "创建人ID不能为空！");
-
-
-		// 创建导出任务
-		ExportTaskInfo task = new ExportTaskInfo();
-		task.setRootOrgId(req.getRootOrgId());
-		task.setExamId(req.getExamId());
-		task.setType(ExportTaskType.EXAM_DETAIL);
-		task.setStatus(ExportTaskStatus.WAITING);
-		task.setCreator(req.getCreator());
-		task.setJsonParams(jsonParams);
-		exportTaskService.addExportTask(task);
-	}
-
-	@Override
-	public void asyncExportExamRecordDetails(Long taskId, ExamRecordQuery req) {
-		List<ExamRecordInfo> examRecords;
-		try {
-			examRecords = examRecordService.getExamRecordDetailListForAsync(req);
-
-			if (CollectionUtils.isEmpty(examRecords)) {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
-				return;
-			}
-
-		} catch (Exception e) {
-			LOG.error(e.getMessage(),e);
-			if (e instanceof StatusException) {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
-						((StatusException) e).getDesc());
-			} else {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "导出数据异常");
-			}
-			return;
-		}
-		// 导出文件的存储路径
-		String examName = examRecords.get(0).getExamName();
-		final String filePath = String.format("/%s/%s/%s/%s/%s_考试明细.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
-				dateDir(), randomUUID(), examName);
-		String tempFilePath = systemConfig.getTempDataDir() + File.separator + filePath;
-		File tempFile = new File(tempFilePath);
-		try {
-			tempFile.getParentFile().mkdirs();
-			tempFile.createNewFile();
-		} catch (IOException e) {
-			LOG.error(e.getMessage(), e);
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
-			return;
-		}
-		try (FileOutputStream out = new FileOutputStream(tempFile);) {
-
-			ExcelExportUtil.exportExcel(ExamRecordInfo.class, examRecords, out);
-
-			// 上传至文件服务器
-			FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
-			env.setRootOrgId(String.valueOf(req.getRootOrgId()));
-			env.setRelativePath(filePath);
-			YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
-
-			LOG.info("asyncExportExamRecordDetails finished... " + oss.getRelativePath());
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
-		} catch (Exception e) {
-			LOG.info("asyncExportExamRecordDetails error... " + e.getMessage());
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
-		} finally {
-			FileUtils.deleteQuietly(tempFile);
-		}
-	}
-
-	@Override
-	public void exportExamScoreStatistics(String jsonParams, User user) {
-		ExamScoreQuery req = new JsonMapper().parseJson(jsonParams, ExamScoreQuery.class);
-		req.setRootOrgId(user.getRootOrgId());
-		Check.isNull(req, "请求参数不能为空！");
-		Check.isNull(req.getRootOrgId(), "学校ID不能为空！");
-		Check.isNull(req.getExamId(), "考试ID不能为空！");
-		Check.isNull(req.getCreator(), "创建人ID不能为空！");
-
-		// 创建导出任务
-		ExportTaskInfo task = new ExportTaskInfo();
-		task.setRootOrgId(req.getRootOrgId());
-		task.setExamId(req.getExamId());
-		task.setType(ExportTaskType.SCORE_STATISTIC);
-		task.setStatus(ExportTaskStatus.WAITING);
-		task.setCreator(req.getCreator());
-		task.setJsonParams(jsonParams);
-		exportTaskService.addExportTask(task);
-	}
-
-	@Override
-	public void asyncExportExamScoreStatistics(Long taskId, ExamScoreQuery req) {
-		List<ExamScoreInfo> examScores;
-		try {
-			examScores = examScoreService.exportExamScoreListForAsync(req);
-			if (CollectionUtils.isEmpty(examScores)) {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
-				return;
-			}
-		} catch (Exception e) {
-			LOG.error(e.getMessage(), e);
-			if (e instanceof StatusException) {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
-						((StatusException) e).getDesc());
-			} else {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "导出数据异常");
-			}
-			return;
-		}
-		// 导出文件的存储路径
-		String examName = examScores.get(0).getExamName();
-		final String filePath = String.format("/%s/%s/%s/%s/%s_成绩统计.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
-				dateDir(), randomUUID(), examName);
-		String tempFilePath = systemConfig.getTempDataDir() + File.separator + filePath;
-		File tempFile = new File(tempFilePath);
-		try {
-			tempFile.getParentFile().mkdirs();
-			tempFile.createNewFile();
-		} catch (IOException e) {
-			LOG.error(e.getMessage(), e);
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
-			return;
-		}
-		try (FileOutputStream out = new FileOutputStream(tempFile);) {
-			ExcelExportUtil.exportExcel(ExamScoreInfo.class, examScores, out);
-
-			// 上传至文件服务器
-			FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
-			env.setRootOrgId(String.valueOf(req.getRootOrgId()));
-			env.setRelativePath(filePath);
-			YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
-
-			LOG.info("asyncExportExamScoreStatistics finished... " + oss.getRelativePath());
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
-		} catch (Exception e) {
-			LOG.info("asyncExportExamScoreStatistics error... " + e.getMessage());
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
-		} finally {
-			FileUtils.deleteQuietly(tempFile);
-		}
-	}
-
-	@Override
-	public void asyncExportExamAuditList(Long taskId, ExamAuditQuery req) {
-		List<ExamAuditInfo> auditInfos;
-		try {
-			auditInfos = examAuditService.getExamAudit(req);
-
-			if (CollectionUtils.isEmpty(auditInfos)) {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
-				return;
-			}
-			for (ExamAuditInfo examAuditInfo : auditInfos) {
-				examAuditInfo.setIdentityNumber(
-						IdentityNumberHelper.conceal(req.getRootOrgId(), examAuditInfo.getIdentityNumber()));
-			}
-
-		} catch (Exception e) {
-			LOG.error(e.getMessage(), e);
-			if (e instanceof StatusException) {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
-						((StatusException) e).getDesc());
-			} else {
-				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "导出数据异常");
-			}
-			return;
-		}
-		// 导出文件的存储路径
-		String examName = auditInfos.get(0).getExamName();
-		final String filePath = String.format("/%s/%s/%s/%s/%s_监考已审.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
-				dateDir(), randomUUID(), examName);
-		String tempFilePath = systemConfig.getTempDataDir() + File.separator + filePath;
-		File tempFile = new File(tempFilePath);
-		try {
-			tempFile.getParentFile().mkdirs();
-			tempFile.createNewFile();
-		} catch (IOException e) {
-			LOG.error(e.getMessage(), e);
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
-			return;
-		}
-		try (FileOutputStream out = new FileOutputStream(tempFile);) {
-
-			ExcelExportUtil.exportExcel(ExamAuditInfo.class, auditInfos, out);
-
-			// 上传至文件服务器
-			FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
-			env.setRootOrgId(String.valueOf(req.getRootOrgId()));
-			env.setRelativePath(filePath);
-			YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
-
-			LOG.info("asyncExportExamAuditList finished... " + oss.getRelativePath());
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
-		} catch (Exception e) {
-			LOG.info("asyncExportExamAuditList error... " + e.getMessage());
-			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
-		} finally {
-			FileUtils.deleteQuietly(tempFile);
-		}
-	}
-
-	@Override
-	public void exportExamAuditList(String query, User user) {
-		ExamStudentQuery req = new JsonMapper().parseJson(query, ExamStudentQuery.class);
-		req.setRootOrgId(user.getRootOrgId());
-		Check.isNull(req, "请求参数不能为空！");
-		Check.isNull(req.getExamId(), "请先选择考试批次！");
-
-		// 创建导出任务
-		ExportTaskInfo task = new ExportTaskInfo();
-		task.setRootOrgId(user.getRootOrgId());
-		task.setExamId(req.getExamId());
-		task.setType(ExportTaskType.AUDIT);
-		task.setStatus(ExportTaskStatus.WAITING);
-		task.setCreator(user.getUserId());
-		task.setJsonParams(query);
-		exportTaskService.addExportTask(task);
-	}
-
-	private String randomUUID() {
-		return UUID.randomUUID().toString().replace("-", "");
-	}
-
-	private String dateDir() {
-		final String pattern = "yyyyMM";
-		return new SimpleDateFormat(pattern).format(new Date());
-	}
+    private static final Logger LOG = LoggerFactory.getLogger(AsyncExportServiceImpl.class);
+
+    private static final String TASK_EXPORT_DIR = "task_export";
+
+    @Autowired
+    private ExportTaskService exportTaskService;
+
+    @Autowired
+    private ExamRecordService examRecordService;
+
+    @Autowired
+    private ExamScoreService examScoreService;
+
+    @Autowired
+    private SystemProperties systemConfig;
+
+    @Autowired
+    private ExamStudentService examStudentService;
+
+    @Autowired
+    private ExamAuditService examAuditService;
+
+    @Override
+    public void exportExamScheduling(String jsonParams, User user) {
+        ExamStudentQuery req = new JsonMapper().parseJson(jsonParams, ExamStudentQuery.class);
+        req.setRootOrgId(user.getRootOrgId());
+        Check.isNull(req, "请求参数不能为空！");
+        Check.isNull(req.getExamId(), "请先选择考试批次！");
+
+        // 创建导出任务
+        ExportTaskInfo task = new ExportTaskInfo();
+        task.setRootOrgId(user.getRootOrgId());
+        task.setExamId(req.getExamId());
+        task.setType(ExportTaskType.EXAM_SCHEDULING);
+        task.setStatus(ExportTaskStatus.WAITING);
+        task.setCreator(user.getUserId());
+        task.setJsonParams(jsonParams);
+        exportTaskService.addExportTask(task);
+    }
+
+    @Override
+    public void asyncExportExamScheduling(Long taskId, ExamStudentQuery req) {
+        List<ExamStudentExcel> examRecords;
+        List<ExamStudentInfo> examStudentInfoList;
+        try {
+            examStudentInfoList = examStudentService.getExamStudentInfoListForAsync(req);
+            if (CollectionUtils.isEmpty(examStudentInfoList)) {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
+                return;
+            }
+            examRecords = ExamStudentEntityConvert.ofExcel(examStudentInfoList);
+
+        } catch (Exception e) {
+            LOG.error(e.getMessage(), e);
+            if (e instanceof StatusException) {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
+                        ((StatusException) e).getDesc());
+            } else {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "导出数据异常");
+            }
+            return;
+        }
+        // 导出文件的存储路径
+        Long examId = examStudentInfoList.get(0).getExamId();
+        ExamSettingsCacheBean exam = CacheHelper.getExamSettings(examId);
+        final String filePath = String.format("/%s/%s/%s/%s/%s_考试进度详情.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
+                dateDir(), randomUUID(), exam.getName());
+        String tempFilePath = systemConfig.getTempDataDir() + File.separator + filePath;
+        File tempFile = new File(tempFilePath);
+        try {
+            tempFile.getParentFile().mkdirs();
+            tempFile.createNewFile();
+        } catch (IOException e) {
+            LOG.error(e.getMessage(), e);
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
+            return;
+        }
+        try (FileOutputStream out = new FileOutputStream(tempFile);) {
+
+            ExcelExportUtil.exportExcel(ExamStudentExcel.class, examRecords, out);
+
+            // 上传至文件服务器
+            FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
+            env.setRootOrgId(String.valueOf(req.getRootOrgId()));
+            env.setRelativePath(filePath);
+            YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
+
+            LOG.info("asyncExportExamScheduling finished... " + oss.getRelativePath());
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
+        } catch (Exception e) {
+            LOG.error("asyncExportExamScheduling error... " + e);
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
+        } finally {
+            FileUtils.deleteQuietly(tempFile);
+        }
+    }
+
+    @Override
+    public void exportExamRecordDetails(String jsonParams, User user) {
+        ExamRecordQuery req = new JsonMapper().parseJson(jsonParams, ExamRecordQuery.class);
+        req.setRootOrgId(user.getRootOrgId());
+        Check.isNull(req, "请求参数不能为空！");
+        Check.isNull(req.getRootOrgId(), "学校ID不能为空！");
+        Check.isNull(req.getExamId(), "考试ID不能为空！");
+        Check.isNull(req.getCreator(), "创建人ID不能为空！");
+
+
+        // 创建导出任务
+        ExportTaskInfo task = new ExportTaskInfo();
+        task.setRootOrgId(req.getRootOrgId());
+        task.setExamId(req.getExamId());
+        task.setType(ExportTaskType.EXAM_DETAIL);
+        task.setStatus(ExportTaskStatus.WAITING);
+        task.setCreator(req.getCreator());
+        task.setJsonParams(jsonParams);
+        exportTaskService.addExportTask(task);
+    }
+
+    @Override
+    public void asyncExportExamRecordDetails(Long taskId, ExamRecordQuery req) {
+        List<ExamRecordInfo> examRecords;
+        try {
+            examRecords = examRecordService.getExamRecordDetailListForAsync(req);
+
+            if (CollectionUtils.isEmpty(examRecords)) {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
+                return;
+            }
+
+        } catch (Exception e) {
+            LOG.error(e.getMessage(), e);
+            if (e instanceof StatusException) {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
+                        ((StatusException) e).getDesc());
+            } else {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "导出数据异常");
+            }
+            return;
+        }
+        // 导出文件的存储路径
+        String examName = examRecords.get(0).getExamName();
+        final String filePath = String.format("/%s/%s/%s/%s/%s_考试明细.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
+                dateDir(), randomUUID(), examName);
+        String tempFilePath = systemConfig.getTempDataDir() + File.separator + filePath;
+        File tempFile = new File(tempFilePath);
+        try {
+            tempFile.getParentFile().mkdirs();
+            tempFile.createNewFile();
+        } catch (IOException e) {
+            LOG.error(e.getMessage(), e);
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
+            return;
+        }
+        try (FileOutputStream out = new FileOutputStream(tempFile);) {
+
+            ExcelExportUtil.exportExcel(ExamRecordInfo.class, examRecords, out);
+
+            // 上传至文件服务器
+            FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
+            env.setRootOrgId(String.valueOf(req.getRootOrgId()));
+            env.setRelativePath(filePath);
+            YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
+
+            LOG.info("asyncExportExamRecordDetails finished... " + oss.getRelativePath());
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
+        } catch (Exception e) {
+            LOG.info("asyncExportExamRecordDetails error... " + e.getMessage());
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
+        } finally {
+            FileUtils.deleteQuietly(tempFile);
+        }
+    }
+
+    @Override
+    public void exportExamScoreStatistics(String jsonParams, User user) {
+        ExamScoreQuery req = new JsonMapper().parseJson(jsonParams, ExamScoreQuery.class);
+        req.setRootOrgId(user.getRootOrgId());
+        Check.isNull(req, "请求参数不能为空！");
+        Check.isNull(req.getRootOrgId(), "学校ID不能为空！");
+        Check.isNull(req.getExamId(), "考试ID不能为空！");
+        Check.isNull(req.getCreator(), "创建人ID不能为空！");
+
+        // 创建导出任务
+        ExportTaskInfo task = new ExportTaskInfo();
+        task.setRootOrgId(req.getRootOrgId());
+        task.setExamId(req.getExamId());
+        task.setType(ExportTaskType.SCORE_STATISTIC);
+        task.setStatus(ExportTaskStatus.WAITING);
+        task.setCreator(req.getCreator());
+        task.setJsonParams(jsonParams);
+        exportTaskService.addExportTask(task);
+    }
+
+    @Override
+    public void asyncExportExamScoreStatistics(Long taskId, ExamScoreQuery req) {
+        List<ExamScoreInfo> examScores;
+        try {
+            examScores = examScoreService.exportExamScoreListForAsync(req);
+            if (CollectionUtils.isEmpty(examScores)) {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
+                return;
+            }
+        } catch (Exception e) {
+            LOG.error(e.getMessage(), e);
+            if (e instanceof StatusException) {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
+                        ((StatusException) e).getDesc());
+            } else {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "导出数据异常");
+            }
+            return;
+        }
+        // 导出文件的存储路径
+        String examName = examScores.get(0).getExamName();
+        final String filePath = String.format("/%s/%s/%s/%s/%s_成绩统计.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
+                dateDir(), randomUUID(), examName);
+        String tempFilePath = systemConfig.getTempDataDir() + File.separator + filePath;
+        File tempFile = new File(tempFilePath);
+        try {
+            tempFile.getParentFile().mkdirs();
+            tempFile.createNewFile();
+        } catch (IOException e) {
+            LOG.error(e.getMessage(), e);
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
+            return;
+        }
+        try (FileOutputStream out = new FileOutputStream(tempFile);) {
+            ExcelExportUtil.exportExcel(ExamScoreInfo.class, examScores, out);
+
+            // 上传至文件服务器
+            FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
+            env.setRootOrgId(String.valueOf(req.getRootOrgId()));
+            env.setRelativePath(filePath);
+            YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
+
+            LOG.info("asyncExportExamScoreStatistics finished... " + oss.getRelativePath());
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
+        } catch (Exception e) {
+            LOG.info("asyncExportExamScoreStatistics error... " + e.getMessage());
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
+        } finally {
+            FileUtils.deleteQuietly(tempFile);
+        }
+    }
+
+    @Override
+    public void asyncExportExamAuditList(Long taskId, ExamAuditQuery req) {
+        List<ExamAuditInfo> auditInfos;
+        try {
+            auditInfos = examAuditService.getExamAudit(req);
+
+            if (CollectionUtils.isEmpty(auditInfos)) {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
+                return;
+            }
+            for (ExamAuditInfo examAuditInfo : auditInfos) {
+                examAuditInfo.setIdentityNumber(
+                        IdentityNumberHelper.conceal(req.getRootOrgId(), examAuditInfo.getIdentityNumber()));
+            }
+
+        } catch (Exception e) {
+            LOG.error(e.getMessage(), e);
+            if (e instanceof StatusException) {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR,
+                        ((StatusException) e).getDesc());
+            } else {
+                exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "导出数据异常");
+            }
+            return;
+        }
+        // 导出文件的存储路径
+        String examName = auditInfos.get(0).getExamName();
+        final String filePath = String.format("/%s/%s/%s/%s/%s_监考已审.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
+                dateDir(), randomUUID(), examName);
+        String tempFilePath = systemConfig.getTempDataDir() + File.separator + filePath;
+        File tempFile = new File(tempFilePath);
+        try {
+            tempFile.getParentFile().mkdirs();
+            tempFile.createNewFile();
+        } catch (IOException e) {
+            LOG.error(e.getMessage(), e);
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "生成导出文件异常");
+            return;
+        }
+        try (FileOutputStream out = new FileOutputStream(tempFile);) {
+
+            ExcelExportUtil.exportExcel(ExamAuditInfo.class, auditInfos, out);
+
+            // 上传至文件服务器
+            FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
+            env.setRootOrgId(String.valueOf(req.getRootOrgId()));
+            env.setRelativePath(filePath);
+            YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
+
+            LOG.info("asyncExportExamAuditList finished... " + oss.getRelativePath());
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
+        } catch (Exception e) {
+            LOG.info("asyncExportExamAuditList error... " + e.getMessage());
+            exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
+        } finally {
+            FileUtils.deleteQuietly(tempFile);
+        }
+    }
+
+    @Override
+    public void exportExamAuditList(String query, User user) {
+        ExamStudentQuery req = new JsonMapper().parseJson(query, ExamStudentQuery.class);
+        req.setRootOrgId(user.getRootOrgId());
+        Check.isNull(req, "请求参数不能为空！");
+        Check.isNull(req.getExamId(), "请先选择考试批次！");
+
+        // 创建导出任务
+        ExportTaskInfo task = new ExportTaskInfo();
+        task.setRootOrgId(user.getRootOrgId());
+        task.setExamId(req.getExamId());
+        task.setType(ExportTaskType.AUDIT);
+        task.setStatus(ExportTaskStatus.WAITING);
+        task.setCreator(user.getUserId());
+        task.setJsonParams(query);
+        exportTaskService.addExportTask(task);
+    }
+
+    private String randomUUID() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+
+    private String dateDir() {
+        final String pattern = "yyyyMM";
+        return new SimpleDateFormat(pattern).format(new Date());
+    }
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamAuditServiceImpl.java

@@ -9,7 +9,6 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.Searcher;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SqlWrapper;
@@ -20,7 +19,6 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.*;
 import cn.com.qmth.examcloud.core.oe.admin.service.*;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.*;
-import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.marking.api.MarkWorkCloudService;
 import cn.com.qmth.examcloud.marking.api.request.AppendMarkWorkPaperReq;
 import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
@@ -60,29 +58,40 @@ import static cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAud
  */
 @Service
 public class ExamAuditServiceImpl implements ExamAuditService {
+
     @Autowired
     private ExamAuditRepo examAuditRepo;
+
     @Autowired
     private ExamScoreRepo examScoreRepo;
+
     @Autowired
     private EntityManager entityManager;
 
     @Autowired
     private ExamRecordDataRepo examRecordDataRepo;
+
     @Autowired
     private ExamRecordQuestionsService examRecordQuestionsService;
+
     @Autowired
     private ExamRecordForMarkingRepo examRecordForMarkingRepo;
+
     @Autowired
     private GainBaseDataService gainBaseDataService;
+
     @Autowired
     private ExamScorePushQueueService examScorePushQueueService;
+
     @Autowired
     private ExamScoreObtainQueueService examScoreObtainQueueService;
+
     @Autowired
     MarkWorkCloudService markWorkCloudService;
+
     @Autowired
     private ExamFaceLivenessVerifyRepo examFaceLivenessVerifyRepo;
+
     @Autowired
     private IllegallyTypeService illegallyTypeService;
 
@@ -97,6 +106,7 @@ public class ExamAuditServiceImpl implements ExamAuditService {
 
     @Autowired
     ExamStudentFinalScoreRepo examStudentFinalScoreRepo;
+
     /**
      * 活体检测失败自动审核
      */
@@ -127,7 +137,7 @@ public class ExamAuditServiceImpl implements ExamAuditService {
         if (query.getSelectType() == null || query.getSelectType() != SelectType.EXPORT) {
             final String count = "count(0)";
             final String leftJoin = "LEFT JOIN ec_oe_exam_process_record AS process ON record.id = process.exam_record_data_id";
-            String countSql = wrapper.build().replace(columns, count).replace(leftJoin," ");
+            String countSql = wrapper.build().replace(columns, count).replace(leftJoin, " ");
             Query countQuery = entityManager.createNativeQuery(countSql);
             BigInteger element = (BigInteger) countQuery.getSingleResult();
             totalSize = element.longValue();
@@ -141,7 +151,7 @@ public class ExamAuditServiceImpl implements ExamAuditService {
         wrapper.orderBy("record.update_time", true);//需求调整20200816：按审核时间排序
         Query dataQuery = entityManager.createNativeQuery(wrapper.build());
 
-//        dataQuery.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(HashMap.class));
+        //        dataQuery.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(HashMap.class));
         dataQuery.unwrap(NativeQuery.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
         if (query.getSelectType() == null || query.getSelectType() != SelectType.EXPORT) {
             dataQuery.setFirstResult((int) pageable.getOffset());
@@ -224,7 +234,7 @@ public class ExamAuditServiceImpl implements ExamAuditService {
     }
 
 
-    private SqlWrapper getSqlWrapper(ExamAuditQuery query){
+    private SqlWrapper getSqlWrapper(ExamAuditQuery query) {
         final String columns = ExamAuditMapper.defaultColumns();
         SqlWrapper wrapper = new SqlWrapper()
                 .select(columns).from("ec_oe_exam_audit").as("audit")
@@ -466,7 +476,7 @@ public class ExamAuditServiceImpl implements ExamAuditService {
 
         //同时该考试记录为违纪、异常、已审
         Optional<ExamRecordDataEntity> byId = examRecordDataRepo.findById(realExamRecordDataId);
-        if(byId.isPresent()){
+        if (byId.isPresent()) {
             ExamRecordDataEntity entity = byId.get();
             entity.setIsIllegality(true);
             entity.setIsWarn(true);
@@ -616,4 +626,5 @@ public class ExamAuditServiceImpl implements ExamAuditService {
         //发送通知
         examScoreObtainQueueService.sendObtainScoreNotify(examRecordData.getRootOrgId());
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamBossServiceImpl.java

@@ -16,24 +16,25 @@ import org.springframework.stereotype.Service;
 @Service("examBossService")
 public class ExamBossServiceImpl implements ExamBossService {
 
-	@Autowired
-	private RedisClient redisClient;
+    @Autowired
+    private RedisClient redisClient;
 
-	@Override
-	public void saveExamBoss(Long examStudentId, ExamBoss eb) {
-		String key = RedisKeyHelper.getBuilder().examBossKey(examStudentId);
-		redisClient.set(key, eb, 2592000);
-	}
+    @Override
+    public void saveExamBoss(Long examStudentId, ExamBoss eb) {
+        String key = RedisKeyHelper.getBuilder().examBossKey(examStudentId);
+        redisClient.set(key, eb, 2592000);
+    }
 
-	@Override
-	public ExamBoss getExamBoss(Long examStudentId) {
-		String key = RedisKeyHelper.getBuilder().examBossKey(examStudentId);
-		return redisClient.get(key, ExamBoss.class);
-	}
+    @Override
+    public ExamBoss getExamBoss(Long examStudentId) {
+        String key = RedisKeyHelper.getBuilder().examBossKey(examStudentId);
+        return redisClient.get(key, ExamBoss.class);
+    }
+
+    @Override
+    public void deleteExamBoss(Long examStudentId) {
+        String key = RedisKeyHelper.getBuilder().examBossKey(examStudentId);
+        redisClient.delete(key);
+    }
 
-	@Override
-	public void deleteExamBoss(Long examStudentId) {
-		String key = RedisKeyHelper.getBuilder().examBossKey(examStudentId);
-		redisClient.delete(key);
-	}
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamCaptureServiceImpl.java

@@ -7,33 +7,12 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.lang3.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.google.common.collect.Lists;
-
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamCaptureRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamSyncCaptureRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamAuditEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamCaptureEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamSyncCaptureEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.IllegallyTypeEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.AuditStatus;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamAuditService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamCaptureService;
@@ -48,6 +27,20 @@ import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.SysPropertyCacheBean;
 import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 考试抓拍检测相关接口
@@ -57,16 +50,22 @@ import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
  */
 @Service
 public class ExamCaptureServiceImpl implements ExamCaptureService {
+
     @Autowired
     private ExamCaptureRepo examCaptureRepo;
+
     @Autowired
     private ExamAuditService examAuditService;
+
     @Autowired
     private ExamRecordDataRepo examRecordDataRepo;
+
     @Autowired
     private ExamSyncCaptureRepo examSyncCaptureRepo;
+
     @Autowired
     private IllegallyTypeService illegallyTypeService;
+
     @Autowired
     private ExamScoreRepo examScoreRepo;
 
@@ -179,8 +178,8 @@ public class ExamCaptureServiceImpl implements ExamCaptureService {
                         for (int i = 0; i < jsonArray.length(); i++) {
                             try {
                                 JSONObject jsonObject = (JSONObject) jsonArray.get(i);
-                                if (jsonObject.isNull("pid")||StringUtils.isBlank(jsonObject.getString("pid"))) {
-                            		virtualCameraNames.add(jsonObject.getString("name"));
+                                if (jsonObject.isNull("pid") || StringUtils.isBlank(jsonObject.getString("pid"))) {
+                                    virtualCameraNames.add(jsonObject.getString("name"));
                                 }
                             } catch (JSONException e) {
                                 //主要针对json数组最后的空对象处理，不影响业务
@@ -244,7 +243,7 @@ public class ExamCaptureServiceImpl implements ExamCaptureService {
                 for (int i = 0; i < jsonArray.length(); i++) {
                     try {
                         JSONObject jsonObject = (JSONObject) jsonArray.get(i);
-                        if (jsonObject.isNull("pid")||StringUtils.isBlank(jsonObject.getString("pid"))) {
+                        if (jsonObject.isNull("pid") || StringUtils.isBlank(jsonObject.getString("pid"))) {
                             sb.append(jsonObject.getString("name") + ",");
                         }
                     } catch (JSONException e) {

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamProcessRecordServiceImpl.java

@@ -19,6 +19,7 @@ import java.util.List;
  */
 @Service("examProcessRecordService")
 public class ExamProcessRecordServiceImpl implements ExamProcessRecordService {
+
     @Autowired
     private ExamProcessRecordRepo examProcessRecordRepo;
 
@@ -48,4 +49,5 @@ public class ExamProcessRecordServiceImpl implements ExamProcessRecordService {
 
         return resultList;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordDataCacheServiceImpl.java

@@ -31,4 +31,5 @@ public class ExamRecordDataCacheServiceImpl implements ExamRecordDataCacheServic
         String key = RedisKeyHelper.getBuilder().examRecordDataKey(examRecordDataId);
         return redisClient.get(key, ExamRecordData.class);
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordDataSyncServiceImpl.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataSyncRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataSyncEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordDataSyncService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service("examRecordDataSyncServiceImpl")
 public class ExamRecordDataSyncServiceImpl implements ExamRecordDataSyncService {
@@ -16,8 +15,8 @@ public class ExamRecordDataSyncServiceImpl implements ExamRecordDataSyncService
 
     @Override
     public Long getExamRecordDataIdByCacheId(Long cacheId) {
-        ExamRecordDataSyncEntity e=examRecordDataSyncRepo.findByCacheId(cacheId);
-        if(e!=null) {
+        ExamRecordDataSyncEntity e = examRecordDataSyncRepo.findByCacheId(cacheId);
+        if (e != null) {
             return e.getDbId();
         }
         return null;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordForMarkingServiceImpl.java

@@ -1,24 +1,5 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
-
-import cn.com.qmth.examcloud.support.enums.ExamProperties;
-import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordForMarkingRepo;
@@ -29,12 +10,21 @@ import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordForMarkingService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordQuestionsService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordDataBean;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
+import cn.com.qmth.examcloud.support.enums.ExamProperties;
 import cn.com.qmth.examcloud.support.filestorage.FileStorageUtil;
+import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
 
 /**
  * @author chenken
@@ -98,6 +88,7 @@ public class ExamRecordForMarkingServiceImpl implements ExamRecordForMarkingServ
 
     /**
      * 获取阅卷类型
+     *
      * @param examId
      * @return
      */
@@ -129,6 +120,7 @@ public class ExamRecordForMarkingServiceImpl implements ExamRecordForMarkingServ
 
     /**
      * 获取考试类型
+     *
      * @param examId
      * @return
      */
@@ -359,7 +351,7 @@ public class ExamRecordForMarkingServiceImpl implements ExamRecordForMarkingServ
             return null;
         }
 
-        Long examId=examRecordForMarkingList.get(0).getExamId();
+        Long examId = examRecordForMarkingList.get(0).getExamId();
         ExamType examType = getExamType(examId);
 
         if (examType == ExamType.OFFLINE) {
@@ -377,4 +369,5 @@ public class ExamRecordForMarkingServiceImpl implements ExamRecordForMarkingServ
         }
         return null;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordPaperStructServiceImpl.java

@@ -24,120 +24,121 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
- * @author  	chenken
- * @date    	2018年11月13日 上午11:52:02
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年11月13日 上午11:52:02
+ * @company QMTH
  * @description 试卷结构服务类
  */
 @Service("examRecordPaperStructService")
-public class ExamRecordPaperStructServiceImpl implements ExamRecordPaperStructService{
-
-	@Autowired
-	private ExamRecordDataRepo examRecordDataRepo;
-
-	@Autowired
-	private ExamRecordPaperStructRepo examRecordPaperStructRepo;
-	
-	@Autowired
-	private JdbcTemplate jdbcTemplate;
-	
-	@Autowired
-	private MongoTemplate mongoTemplate;
-
-	@Override
-	public ExamRecordPaperStructEntity getExamRecordPaperStruct(Long examRecordDataId) {
-		ExamRecordDataEntity examRecordDataEntity = GlobalHelper.getEntity(examRecordDataRepo,examRecordDataId,ExamRecordDataEntity.class);
-		String paperStructId = examRecordDataEntity.getPaperStructId();
-		ExamRecordPaperStructEntity examRecordPaperStruct = null;
-		if(StringUtils.isBlank(paperStructId)){
-			Map<String,Object> paperInfoMap = getPaperInfoFromOeExamQuestion(examRecordDataEntity.getId());
-			String paperId = paperInfoMap.get("paper_id").toString();
-			//从缓存中获取试卷结构
-			BasePaperCacheBean getBasePaperResp = CacheHelper.getBasePaper(paperId);
-
-			examRecordPaperStruct = new ExamRecordPaperStructEntity();
-			examRecordPaperStruct.setDefaultPaper(getBasePaperResp.getDefaultPaper());
-			//保存作答记录
-			List<ExamRecordQuestionsInfo> examRecordQuestionList = encapsulationExamQuestion(examRecordDataEntity);
-			if (examRecordQuestionList.size() > 0) {
-	             mongoTemplate.insert(examRecordQuestionList, Constants.EXAM_RECORD_QUESTIONS);
-	        }
-			//保存试卷结构
-			examRecordPaperStruct = examRecordPaperStructRepo.save(examRecordPaperStruct);
-			//保存考试记录
-			//经测试,从oe_exam_question中获取的paperId最准确
-			examRecordDataEntity.setBasePaperId(paperId);
-			examRecordDataEntity.setPaperType(paperInfoMap.get("paper_type").toString());
-			examRecordDataEntity.setPaperStructId(examRecordPaperStruct.getId());
-			examRecordDataRepo.save(examRecordDataEntity);
-			return examRecordPaperStruct;
-		}else{
-			examRecordPaperStruct =GlobalHelper.getEntity(examRecordPaperStructRepo,paperStructId,ExamRecordPaperStructEntity.class);
-			return examRecordPaperStruct;
-		}
-	}
-
-	/**
-	 * 使用examRecordId查询paperId
-	 * @param examRecordId
-	 * @return
-	 */
-	private Map<String,Object> getPaperInfoFromOeExamQuestion(Long examRecordId){
-		String sql = "select paper_id,paper_type from oe_exam_question where exam_record_id = "+examRecordId+" limit 1";
-		Map<String,Object> examQuestionMap = jdbcTemplate.queryForMap(sql);
-		return examQuestionMap;
-	}
-	
-	/**
-	 * 封装ExamQuestion
-	 * @param examRecordDataEntity
-	 */
-	private List<ExamRecordQuestionsInfo> encapsulationExamQuestion(ExamRecordDataEntity examRecordDataEntity){
-		 List<ExamRecordQuestionsInfo> examRecordQuestionList = new ArrayList<ExamRecordQuestionsInfo>();
-		 ExamRecordQuestionsInfo examRecordQuestion = new ExamRecordQuestionsInfo();
-         examRecordQuestion.setExamRecordDataId(examRecordDataEntity.getId());
-         examRecordQuestion.setCreationTime(examRecordDataEntity.getStartTime());
-         List<Map<String, Object>> rows = jdbcTemplate.queryForList(selectOldRecordQuestionByExamRecordIdSql(examRecordDataEntity.getId()));
-         for (Map<String, Object> row : rows) {
-             ExamRecordQuestionsInfo.ExamQuestionEntity examQuestion = ExamRecordQuestionsInfo.createExamQuestionEntity();
-
-             //转换试题型
-             NewQuestionType questionType = NewQuestionType.convert(Sentence.dealString(row.get("question_type")));
-             if (questionType == null || questionType == NewQuestionType.NESTED) {
-                 continue;
-             }
-
-             //获取试题ID
-             String questionId = Sentence.dealString(row.get("question_id"));
-             if (questionId == null || "".equals(questionId)) {
-                 questionId = Sentence.dealString(row.get("parent_question_id"));
-             }
-
-             //计算考生试题得分
-             Float questionScore = Sentence.dealFloat(row.get("score"));
-             String correctAnswer = Sentence.dealString(row.get("answer"));
-             String studentAnswer = Sentence.dealString(row.get("stu_answer"));
-             Float studentScore = computeStudentScore(questionType, questionScore, correctAnswer, studentAnswer);
-
-             examQuestion.setQuestionId(questionId);
-             examQuestion.setMainNumber(Sentence.dealInteger(row.get("main_number")));
-             examQuestion.setOrder(Sentence.dealInteger(row.get("orders")));
-             examQuestion.setQuestionScore(questionScore);
-             examQuestion.setQuestionType(questionType);
-             examQuestion.setCorrectAnswer(correctAnswer);
-             examQuestion.setStudentAnswer(studentAnswer);
-             examQuestion.setStudentScore(studentScore);
-             examQuestion.setAnswer(Sentence.dealBoolean(row.get("is_answered")));
-             examQuestion.setSign(Sentence.dealBoolean(row.get("is_sign")));
-             examQuestion.setOptionPermutation(new Integer[]{0,1,2,3});
-             examRecordQuestion.addExamQuestion(examQuestion);
-         }
-         examRecordQuestionList.add(examRecordQuestion);
-         return examRecordQuestionList;
-	}
-	
-	private String selectOldRecordQuestionByExamRecordIdSql(Long examRecordId) {
+public class ExamRecordPaperStructServiceImpl implements ExamRecordPaperStructService {
+
+    @Autowired
+    private ExamRecordDataRepo examRecordDataRepo;
+
+    @Autowired
+    private ExamRecordPaperStructRepo examRecordPaperStructRepo;
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Override
+    public ExamRecordPaperStructEntity getExamRecordPaperStruct(Long examRecordDataId) {
+        ExamRecordDataEntity examRecordDataEntity = GlobalHelper.getEntity(examRecordDataRepo, examRecordDataId, ExamRecordDataEntity.class);
+        String paperStructId = examRecordDataEntity.getPaperStructId();
+        ExamRecordPaperStructEntity examRecordPaperStruct = null;
+        if (StringUtils.isBlank(paperStructId)) {
+            Map<String, Object> paperInfoMap = getPaperInfoFromOeExamQuestion(examRecordDataEntity.getId());
+            String paperId = paperInfoMap.get("paper_id").toString();
+            //从缓存中获取试卷结构
+            BasePaperCacheBean getBasePaperResp = CacheHelper.getBasePaper(paperId);
+
+            examRecordPaperStruct = new ExamRecordPaperStructEntity();
+            examRecordPaperStruct.setDefaultPaper(getBasePaperResp.getDefaultPaper());
+            //保存作答记录
+            List<ExamRecordQuestionsInfo> examRecordQuestionList = encapsulationExamQuestion(examRecordDataEntity);
+            if (examRecordQuestionList.size() > 0) {
+                mongoTemplate.insert(examRecordQuestionList, Constants.EXAM_RECORD_QUESTIONS);
+            }
+            //保存试卷结构
+            examRecordPaperStruct = examRecordPaperStructRepo.save(examRecordPaperStruct);
+            //保存考试记录
+            //经测试,从oe_exam_question中获取的paperId最准确
+            examRecordDataEntity.setBasePaperId(paperId);
+            examRecordDataEntity.setPaperType(paperInfoMap.get("paper_type").toString());
+            examRecordDataEntity.setPaperStructId(examRecordPaperStruct.getId());
+            examRecordDataRepo.save(examRecordDataEntity);
+            return examRecordPaperStruct;
+        } else {
+            examRecordPaperStruct = GlobalHelper.getEntity(examRecordPaperStructRepo, paperStructId, ExamRecordPaperStructEntity.class);
+            return examRecordPaperStruct;
+        }
+    }
+
+    /**
+     * 使用examRecordId查询paperId
+     *
+     * @param examRecordId
+     * @return
+     */
+    private Map<String, Object> getPaperInfoFromOeExamQuestion(Long examRecordId) {
+        String sql = "select paper_id,paper_type from oe_exam_question where exam_record_id = " + examRecordId + " limit 1";
+        Map<String, Object> examQuestionMap = jdbcTemplate.queryForMap(sql);
+        return examQuestionMap;
+    }
+
+    /**
+     * 封装ExamQuestion
+     *
+     * @param examRecordDataEntity
+     */
+    private List<ExamRecordQuestionsInfo> encapsulationExamQuestion(ExamRecordDataEntity examRecordDataEntity) {
+        List<ExamRecordQuestionsInfo> examRecordQuestionList = new ArrayList<ExamRecordQuestionsInfo>();
+        ExamRecordQuestionsInfo examRecordQuestion = new ExamRecordQuestionsInfo();
+        examRecordQuestion.setExamRecordDataId(examRecordDataEntity.getId());
+        examRecordQuestion.setCreationTime(examRecordDataEntity.getStartTime());
+        List<Map<String, Object>> rows = jdbcTemplate.queryForList(selectOldRecordQuestionByExamRecordIdSql(examRecordDataEntity.getId()));
+        for (Map<String, Object> row : rows) {
+            ExamRecordQuestionsInfo.ExamQuestionEntity examQuestion = ExamRecordQuestionsInfo.createExamQuestionEntity();
+
+            //转换试题型
+            NewQuestionType questionType = NewQuestionType.convert(Sentence.dealString(row.get("question_type")));
+            if (questionType == null || questionType == NewQuestionType.NESTED) {
+                continue;
+            }
+
+            //获取试题ID
+            String questionId = Sentence.dealString(row.get("question_id"));
+            if (questionId == null || "".equals(questionId)) {
+                questionId = Sentence.dealString(row.get("parent_question_id"));
+            }
+
+            //计算考生试题得分
+            Float questionScore = Sentence.dealFloat(row.get("score"));
+            String correctAnswer = Sentence.dealString(row.get("answer"));
+            String studentAnswer = Sentence.dealString(row.get("stu_answer"));
+            Float studentScore = computeStudentScore(questionType, questionScore, correctAnswer, studentAnswer);
+
+            examQuestion.setQuestionId(questionId);
+            examQuestion.setMainNumber(Sentence.dealInteger(row.get("main_number")));
+            examQuestion.setOrder(Sentence.dealInteger(row.get("orders")));
+            examQuestion.setQuestionScore(questionScore);
+            examQuestion.setQuestionType(questionType);
+            examQuestion.setCorrectAnswer(correctAnswer);
+            examQuestion.setStudentAnswer(studentAnswer);
+            examQuestion.setStudentScore(studentScore);
+            examQuestion.setAnswer(Sentence.dealBoolean(row.get("is_answered")));
+            examQuestion.setSign(Sentence.dealBoolean(row.get("is_sign")));
+            examQuestion.setOptionPermutation(new Integer[]{0, 1, 2, 3});
+            examRecordQuestion.addExamQuestion(examQuestion);
+        }
+        examRecordQuestionList.add(examRecordQuestion);
+        return examRecordQuestionList;
+    }
+
+    private String selectOldRecordQuestionByExamRecordIdSql(Long examRecordId) {
         return new StringBuilder().append("SELECT ")
                 .append("id,exam_record_id,is_answered,is_multiple,is_nested_question,is_sign,orders,")
                 .append("main_number,sub_number,base_paper_id,paper_id,paper_name,paper_number,paper_type,")
@@ -146,7 +147,7 @@ public class ExamRecordPaperStructServiceImpl implements ExamRecordPaperStructSe
                 .append(" WHERE exam_record_id = ").append(examRecordId)
                 .append(" ORDER BY orders ASC").toString();
     }
-	
+
     private Float computeStudentScore(NewQuestionType questionType, Float questionScore, String correctAnswer, String studentAnswer) {
         //若为客观题重新计算考生试题得分
         if (questionType == null || !questionType.isObjective()) {
@@ -169,5 +170,5 @@ public class ExamRecordPaperStructServiceImpl implements ExamRecordPaperStructSe
         }
         return questionScore;
     }
-	
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordQuestionsServiceImpl.java

@@ -54,9 +54,9 @@ public class ExamRecordQuestionsServiceImpl implements ExamRecordQuestionsServic
         ExamRecordDataEntity examRecordData = GlobalHelper.getEntity(examRecordDataRepo, examRecordDataId, ExamRecordDataEntity.class);
 
         ExamRecordQuestionsEntity examRecordQuestionsEntity;
-        if(StringUtils.isNotEmpty(examRecordData.getExamRecordQuestionsId())){
+        if (StringUtils.isNotEmpty(examRecordData.getExamRecordQuestionsId())) {
             examRecordQuestionsEntity = GlobalHelper.getEntity(examRecordQuestionsRepo, examRecordData.getExamRecordQuestionsId(), ExamRecordQuestionsEntity.class);
-        }else {
+        } else {
             examRecordQuestionsEntity = getExamRecordQuestionsAndFixExamRecordDataIfNecessary(examRecordData);
         }
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordServiceImpl.java

@@ -7,43 +7,6 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.math.BigInteger;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import cn.com.qmth.examcloud.support.enums.ExamProperties;
-import cn.com.qmth.examcloud.support.helper.FaceBiopsyHelper;
-import org.apache.commons.lang3.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import com.google.common.collect.Lists;
-
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
@@ -58,16 +21,8 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.ExamCaptureRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamCaptureEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamQuestionEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.IsSuccess;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.MarkingType;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.TrueFalse;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.*;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
 import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
@@ -83,7 +38,34 @@ import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
+import cn.com.qmth.examcloud.support.enums.ExamProperties;
 import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
+import cn.com.qmth.examcloud.support.helper.FaceBiopsyHelper;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.math.BigInteger;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 考试记录接口
@@ -98,27 +80,35 @@ public class ExamRecordServiceImpl implements ExamRecordService {
 
     @Autowired
     private ExamScoreRepo examScoreRepo;
+
     @Autowired
     private ExamRecordDataRepo examRecordDataRepo;
+
     @Autowired
     private EntityManager entityManager;
+
     @Autowired
     private ExamStudentService examStudentService;
+
     @Autowired
     private GainBaseDataService gainBaseDataService;
+
     @Autowired
     private JdbcTemplate jdbcTemplate;
+
     @Autowired
     private ExamRecordEntityConvert examRecordEntityConvert;
+
     @Autowired
     private LocalCacheService localCacheService;
-    
+
     @Autowired
     private StudentCloudService studentCloudService;
+
     @Autowired
     private ExamCaptureRepo examCaptureRepo;
-    
-    
+
+
     private static final String EXAM_RECORD_EXPORT_SQL = "select  record_data.id," +
             "record_data.exam_record_status examRecordStatusValue," +
             "record_data.start_time startTime," +
@@ -159,19 +149,19 @@ public class ExamRecordServiceImpl implements ExamRecordService {
             "record_data.info_collector infoCollector," +
             "audit.audit_user_name audit_user_name," +
             "GROUP_CONCAT(DISTINCT process.source_ip) ip," +
-			"eoes.objective_score objectiveTotalScore," +
-			"eoes.subjective_score subjectiveTotalScore," +
-			"eoes.total_score paperTotalScore,"+
-			"eoest.grade ,"+
-			"eoest.specialty_name specialtyName"+
-            
+            "eoes.objective_score objectiveTotalScore," +
+            "eoes.subjective_score subjectiveTotalScore," +
+            "eoes.total_score paperTotalScore," +
+            "eoest.grade ," +
+            "eoest.specialty_name specialtyName" +
+
             " from ec_oe_exam_record_data record_data " +
             " LEFT JOIN ec_oe_exam_process_record AS process ON record_data.id = process.exam_record_data_id " +
             " LEFT JOIN ec_oe_exam_audit AS audit ON record_data.id = audit.exam_record_data_id " +
-            " LEFT JOIN ec_oe_exam_score eoes ON  record_data.id = eoes.exam_record_data_id "+
-            " LEFT JOIN ec_oe_exam_student eoest ON  record_data.exam_student_id = eoest.exam_student_id "+
+            " LEFT JOIN ec_oe_exam_score eoes ON  record_data.id = eoes.exam_record_data_id " +
+            " LEFT JOIN ec_oe_exam_student eoest ON  record_data.exam_student_id = eoest.exam_student_id " +
             " where 1=1";
-    
+
     /**
      * ec_oe_exam_record_data  查询sql
      */
@@ -312,25 +302,25 @@ public class ExamRecordServiceImpl implements ExamRecordService {
             sqlBuilder.append(" and ((record_data.is_warn = 0) OR (record_data.is_warn  = 1 and record_data.is_audit = 0))");
         }
         sqlBuilder.append(" and record_data.is_illegality = 0");
-        if (StringUtils.isBlank(next)){
-        	sqlBuilder.append(" and record_data.id in (select id from ec_oe_exam_record_data where");
+        if (StringUtils.isBlank(next)) {
+            sqlBuilder.append(" and record_data.id in (select id from ec_oe_exam_record_data where");
             sqlBuilder.append(" id != ");
             sqlBuilder.append(examRecordDataId);
-            sqlBuilder.append(" and exam_id="+query.getExamId());
+            sqlBuilder.append(" and exam_id=" + query.getExamId());
             sqlBuilder.append(" ) ");
             sqlBuilder.append(" order by record_data.id desc");
-        } else if ("1".equals(next)){
-        	sqlBuilder.append(" and record_data.id in (select id from ec_oe_exam_record_data where");
+        } else if ("1".equals(next)) {
+            sqlBuilder.append(" and record_data.id in (select id from ec_oe_exam_record_data where");
             sqlBuilder.append(" id < ");
             sqlBuilder.append(examRecordDataId);
-            sqlBuilder.append(" and exam_id="+query.getExamId());
+            sqlBuilder.append(" and exam_id=" + query.getExamId());
             sqlBuilder.append(" ) ");
             sqlBuilder.append(" order by record_data.id desc");
-        } else if ("0".equals(next)){
-        	sqlBuilder.append(" and record_data.id in (select id from ec_oe_exam_record_data where");
+        } else if ("0".equals(next)) {
+            sqlBuilder.append(" and record_data.id in (select id from ec_oe_exam_record_data where");
             sqlBuilder.append(" id > ");
             sqlBuilder.append(examRecordDataId);
-            sqlBuilder.append(" and exam_id="+query.getExamId());
+            sqlBuilder.append(" and exam_id=" + query.getExamId());
             sqlBuilder.append(" ) ");
             sqlBuilder.append(" order by record_data.id asc");
         }
@@ -459,7 +449,7 @@ public class ExamRecordServiceImpl implements ExamRecordService {
             sql.append(" and record_data.id = " + query.getExamRecordId());
         }
         if (query.getIsIllegality() != null) {
-            if(query.getIsIllegality()){
+            if (query.getIsIllegality()) {
                 sql.append(" and record_data.is_illegality = 1");
             } else {
                 sql.append(" and record_data.is_illegality = 0");
@@ -506,11 +496,11 @@ public class ExamRecordServiceImpl implements ExamRecordService {
         //是否有虚拟设备
         if (query.getHasVirtual() != null) {
             if (query.getHasVirtual()) {
-                sql.append(" and record_data.id in (select t1.id from ec_oe_exam_record_data t1 left join ec_oe_exam_capture t2 on t1.id=t2.exam_record_data_id where t1.exam_id =" + query.getExamId()+" and t2.has_virtual_camera=1 )");
+                sql.append(" and record_data.id in (select t1.id from ec_oe_exam_record_data t1 left join ec_oe_exam_capture t2 on t1.id=t2.exam_record_data_id where t1.exam_id =" + query.getExamId() + " and t2.has_virtual_camera=1 )");
             } else {
                 //原先写法会跟有虚拟设备的出现重复情况，用有虚拟设备的not in
                 //sql.append(" and record_data.id in (select t1.id from ec_oe_exam_record_data t1 left join ec_oe_exam_capture t2 on t1.id=t2.exam_record_data_id where t1.exam_id =" + query.getExamId()+" and (t2.has_virtual_camera=0 or t2.has_virtual_camera is null) )");
-                sql.append(" and record_data.id not in (select t1.id from ec_oe_exam_record_data t1 left join ec_oe_exam_capture t2 on t1.id=t2.exam_record_data_id where t1.exam_id =" + query.getExamId()+" and t2.has_virtual_camera=1 )");
+                sql.append(" and record_data.id not in (select t1.id from ec_oe_exam_record_data t1 left join ec_oe_exam_capture t2 on t1.id=t2.exam_record_data_id where t1.exam_id =" + query.getExamId() + " and t2.has_virtual_camera=1 )");
             }
         }
         return sql;
@@ -686,34 +676,35 @@ public class ExamRecordServiceImpl implements ExamRecordService {
         sqlBuilder.append(" and record_data.is_warn = 1 and record_data.is_audit = 0");
         return jdbcTemplate.queryForObject(sqlBuilder.toString(), Long.class);
     }
+
     @Override
     public List<ExamRecordInfo> getExamRecordDetailListForAsync(ExamRecordQuery query) {
         Check.isNull(query, "查询参数不能为空！");
         query.addRecordStatus(ExamRecordStatus.EXAM_END.name());
         query.addRecordStatus(ExamRecordStatus.EXAM_OVERDUE.name());
 
-        List<ExamRecordInfo> examRecordDataList=new ArrayList<ExamRecordInfo>();
-        Long startId=0L;
-        for(;;) {
-        	List<ExamRecordInfo> tem=getExamRecordDetailPageForExport(query,  startId);
-        	if(tem==null||tem.size()==0) {
-        		break;
-        	}else {
-        		startId=tem.get(tem.size()-1).getId();
-        		examRecordDataList.addAll(tem);
-        	}
+        List<ExamRecordInfo> examRecordDataList = new ArrayList<ExamRecordInfo>();
+        Long startId = 0L;
+        for (; ; ) {
+            List<ExamRecordInfo> tem = getExamRecordDetailPageForExport(query, startId);
+            if (tem == null || tem.size() == 0) {
+                break;
+            } else {
+                startId = tem.get(tem.size() - 1).getId();
+                examRecordDataList.addAll(tem);
+            }
         }
-        if(examRecordDataList==null||examRecordDataList.size()==0) {
-        	 return examRecordDataList;
+        if (examRecordDataList == null || examRecordDataList.size() == 0) {
+            return examRecordDataList;
         }
-        for(ExamRecordInfo erInfo:examRecordDataList) {
-        	setInfo(erInfo,query.getExamId());
+        for (ExamRecordInfo erInfo : examRecordDataList) {
+            setInfo(erInfo, query.getExamId());
         }
-        setPhone(examRecordDataList,query.getRootOrgId());
+        setPhone(examRecordDataList, query.getRootOrgId());
         String examType = examRecordDataList.get(0).getExamType();
-		if (ExamType.ONLINE.name().equals(examType) || ExamType.ONLINE_HOMEWORK.name().equals(examType)) {
-			setVirtualCameraNames(examRecordDataList);
-		}
+        if (ExamType.ONLINE.name().equals(examType) || ExamType.ONLINE_HOMEWORK.name().equals(examType)) {
+            setVirtualCameraNames(examRecordDataList);
+        }
         return examRecordDataList;
     }
 
@@ -748,10 +739,10 @@ public class ExamRecordServiceImpl implements ExamRecordService {
                 boolean checkFailed = succPercent < warnThreshold || livenessSuccessPercent < livenessThreshold;
 
                 //虚拟摄像头进入待审核，且有虚拟摄像头的
-                String valueSql="SELECT value FROM ec_e_exam_prop WHERE exam_id ="+examId+" AND key_id=45";
+                String valueSql = "SELECT value FROM ec_e_exam_prop WHERE exam_id =" + examId + " AND key_id=45";
                 List<Boolean> list = jdbcTemplate.query(valueSql, (rs, rowNum) -> rs.getBoolean("value"));
                 boolean hasVirtualCamera = !CollectionUtils.isEmpty(list) && list.get(0) &&
-                        captureEntities.stream().anyMatch(e->e.getHasVirtualCamera()!=null&&e.getHasVirtualCamera());
+                        captureEntities.stream().anyMatch(e -> e.getHasVirtualCamera() != null && e.getHasVirtualCamera());
 
                 entity.setIsWarn(hasVirtualCamera || checkFailed);
 
@@ -760,87 +751,88 @@ public class ExamRecordServiceImpl implements ExamRecordService {
         }
     }
 
-    private void setPhone(List<ExamRecordInfo> examRecordDataList,Long rootOrgId) {
-    	GetStudentListByIdsReq req= new GetStudentListByIdsReq();
+    private void setPhone(List<ExamRecordInfo> examRecordDataList, Long rootOrgId) {
+        GetStudentListByIdsReq req = new GetStudentListByIdsReq();
         BatchSetDataUtil<ExamRecordInfo> tool = new BatchSetDataUtil<ExamRecordInfo>() {
-			@Override
-			public void setData(List<ExamRecordInfo> dataList) {
-				req.setRootOrgId(rootOrgId);
-				List<Long> ids = dataList.stream().map(dto -> dto.getStudentId()).distinct().collect(Collectors.toList());
-				req.setStudentIdList(ids);
-				GetStudentListByIdsResp resp=studentCloudService.getStudentListByIds(req);
-				if(resp.getStudentBeanList()!=null&&resp.getStudentBeanList().size()>0) {
-					Map<Long, String> map = resp.getStudentBeanList().stream()
-							.collect(Collectors.toMap(StudentBean::getId, account -> (account.getPhoneNumber()==null?"":account.getPhoneNumber())));
-					for(ExamRecordInfo erInfo:dataList) {
-						erInfo.setPhone(map.get(erInfo.getStudentId()));
-					}
-				}
-			}
-
-		};
-		tool.setDataForBatch(examRecordDataList, 100);
+            @Override
+            public void setData(List<ExamRecordInfo> dataList) {
+                req.setRootOrgId(rootOrgId);
+                List<Long> ids = dataList.stream().map(dto -> dto.getStudentId()).distinct().collect(Collectors.toList());
+                req.setStudentIdList(ids);
+                GetStudentListByIdsResp resp = studentCloudService.getStudentListByIds(req);
+                if (resp.getStudentBeanList() != null && resp.getStudentBeanList().size() > 0) {
+                    Map<Long, String> map = resp.getStudentBeanList().stream()
+                            .collect(Collectors.toMap(StudentBean::getId, account -> (account.getPhoneNumber() == null ? "" : account.getPhoneNumber())));
+                    for (ExamRecordInfo erInfo : dataList) {
+                        erInfo.setPhone(map.get(erInfo.getStudentId()));
+                    }
+                }
+            }
+
+        };
+        tool.setDataForBatch(examRecordDataList, 100);
     }
+
     private void setVirtualCameraNames(List<ExamRecordInfo> examRecordDataList) {
         BatchSetDataUtil<ExamRecordInfo> tool = new BatchSetDataUtil<ExamRecordInfo>() {
-			@Override
-			public void setData(List<ExamRecordInfo> dataList) {
-				List<Long> ids = dataList.stream().map(dto -> dto.getId()).distinct().collect(Collectors.toList());
-				Map<Long,Set<String>> map=new HashMap<>();
-		        List<ExamCaptureEntity> examCaptureList = examCaptureRepo.findByExamRecordDataIdIn(ids);
-		        if (examCaptureList != null && examCaptureList.size() > 0) {
-		            for (ExamCaptureEntity examCapture : examCaptureList) {
-		            	Set<String> virtualCameraNames=map.get(examCapture.getExamRecordDataId());
-		            	if(virtualCameraNames==null) {
-		            		virtualCameraNames= new HashSet<String>();
-		            		map.put(examCapture.getExamRecordDataId(), virtualCameraNames);
-		            	}
-		                String cameraInfos = examCapture.getCameraInfos();
-		                if (StringUtils.isNotBlank(cameraInfos)) {
-		                    JSONArray jsonArray;
-		                    try {
-		                        jsonArray = new JSONArray(cameraInfos);
-		                        for (int i = 0; i < jsonArray.length(); i++) {
-		                            try {
-		                                JSONObject jsonObject = (JSONObject) jsonArray.get(i);
-		                                if (StringUtils.isBlank(jsonObject.getString("pid"))) {
-		                                    virtualCameraNames.add(jsonObject.getString("name"));
-		                                }
-		                            } catch (JSONException e) {
-		                                //主要针对json数组最后的空对象处理，不影响业务
-		                                LOG.error("抓拍照片格式不正确", e);
-		                                continue;
-		                            }
-		                        }
-		                    } catch (JSONException e) {
-		                        LOG.error("获取虚拟摄像头名称失败", e);
-		                        throw new StatusException("ExamCaptureService-001", "获取虚拟摄像头名称失败");
-		                    }
-
-		                }
-		            }
-		        }
-		        for(ExamRecordInfo erInfo:dataList) {
-					erInfo.setVirtualCameraNames(getStrFromSet(map.get(erInfo.getId())));
-				}
-			}
-
-		};
-		tool.setDataForBatch(examRecordDataList, 100);
+            @Override
+            public void setData(List<ExamRecordInfo> dataList) {
+                List<Long> ids = dataList.stream().map(dto -> dto.getId()).distinct().collect(Collectors.toList());
+                Map<Long, Set<String>> map = new HashMap<>();
+                List<ExamCaptureEntity> examCaptureList = examCaptureRepo.findByExamRecordDataIdIn(ids);
+                if (examCaptureList != null && examCaptureList.size() > 0) {
+                    for (ExamCaptureEntity examCapture : examCaptureList) {
+                        Set<String> virtualCameraNames = map.get(examCapture.getExamRecordDataId());
+                        if (virtualCameraNames == null) {
+                            virtualCameraNames = new HashSet<String>();
+                            map.put(examCapture.getExamRecordDataId(), virtualCameraNames);
+                        }
+                        String cameraInfos = examCapture.getCameraInfos();
+                        if (StringUtils.isNotBlank(cameraInfos)) {
+                            JSONArray jsonArray;
+                            try {
+                                jsonArray = new JSONArray(cameraInfos);
+                                for (int i = 0; i < jsonArray.length(); i++) {
+                                    try {
+                                        JSONObject jsonObject = (JSONObject) jsonArray.get(i);
+                                        if (StringUtils.isBlank(jsonObject.getString("pid"))) {
+                                            virtualCameraNames.add(jsonObject.getString("name"));
+                                        }
+                                    } catch (JSONException e) {
+                                        //主要针对json数组最后的空对象处理，不影响业务
+                                        LOG.error("抓拍照片格式不正确", e);
+                                        continue;
+                                    }
+                                }
+                            } catch (JSONException e) {
+                                LOG.error("获取虚拟摄像头名称失败", e);
+                                throw new StatusException("ExamCaptureService-001", "获取虚拟摄像头名称失败");
+                            }
+
+                        }
+                    }
+                }
+                for (ExamRecordInfo erInfo : dataList) {
+                    erInfo.setVirtualCameraNames(getStrFromSet(map.get(erInfo.getId())));
+                }
+            }
+
+        };
+        tool.setDataForBatch(examRecordDataList, 100);
     }
-    
+
     private String getStrFromSet(Set<String> set) {
-    	if(set==null||set.size()==0) {
-    		return null;
-    	}
-    	StringJoiner sj = new StringJoiner(";");
+        if (set == null || set.size() == 0) {
+            return null;
+        }
+        StringJoiner sj = new StringJoiner(";");
         for (String cameraName : set) {
             sj.add(cameraName);
         }
         return sj.toString();
     }
-    
-    private void  setInfo(ExamRecordInfo info,Long examId) {
+
+    private void setInfo(ExamRecordInfo info, Long examId) {
         info.setDataId(info.getId());
         if (info.getExamTypeValue() != null) {
             info.setExamType(info.getExamTypeValue().name());
@@ -889,30 +881,31 @@ public class ExamRecordServiceImpl implements ExamRecordService {
         if (result != null) {
             info.setFaceVerifyResult(result.getDesc());
         }
-        
+
         ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getDefaultCachedExam(examId);
         info.setExamName(examBean.getName());
 
     }
-    
-    private List<ExamRecordInfo> getExamRecordDetailPageForExport(ExamRecordQuery query,Long startId) {
+
+    private List<ExamRecordInfo> getExamRecordDetailPageForExport(ExamRecordQuery query, Long startId) {
         StringBuilder sqlBuilder = new StringBuilder();
         sqlBuilder.append(EXAM_RECORD_EXPORT_SQL);
         sqlBuilder.append(buildExamRecordCommonSelectCondition(query));
         sqlBuilder.append(" and ((record_data.is_warn = 0) OR (record_data.is_warn  = 1 and record_data.is_audit = 1))");
-        sqlBuilder.append(" and record_data.id >"+startId);
+        sqlBuilder.append(" and record_data.id >" + startId);
         sqlBuilder.append(" group by record_data.id ");
         //根据ip查询
         /*if (StringUtils.isNoneBlank(query.getIp())) {
             sqlBuilder.append(" having ip like '%"+query.getIp()+"%' ");
         }*/
         sqlBuilder.append(" order by record_data.id limit 500");
-        
-        RowMapper<ExamRecordInfo> rowMapper=new BeanPropertyRowMapper<ExamRecordInfo>(ExamRecordInfo.class);
-		List<ExamRecordInfo> ret = jdbcTemplate.query(sqlBuilder.toString(), rowMapper);
+
+        RowMapper<ExamRecordInfo> rowMapper = new BeanPropertyRowMapper<ExamRecordInfo>(ExamRecordInfo.class);
+        List<ExamRecordInfo> ret = jdbcTemplate.query(sqlBuilder.toString(), rowMapper);
 
         return ret;
     }
+
     @Override
     public List<ExamRecordInfo> getExamRecordDetailList(ExamRecordQuery query) {
         Check.isNull(query, "查询参数不能为空！");
@@ -1135,4 +1128,5 @@ public class ExamRecordServiceImpl implements ExamRecordService {
         info.setBasePaperId(rs.getString("base_paper_id"));
         return info;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScoreNoticeQueueServiceImpl.java

@@ -1,20 +1,18 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.util.Date;
-
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreNoticeQueueRepo;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreNoticeQueueEntity;
+import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreNoticeQueueService;
+import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreNoticeQueueRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreNoticeQueueEntity;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreNoticeQueueService;
-import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import java.util.Date;
 
 /**
- * 
  * @author lideyin
  * @date 2019年3月11日 下午1:48:32
  * @description 考试成绩通知队列服务实现
@@ -22,30 +20,31 @@ import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 @Service("examScoreNoticeQueueService")
 public class ExamScoreNoticeQueueServiceImpl implements ExamScoreNoticeQueueService {
 
-	private static final Logger log = LoggerFactory.getLogger(ExamScoreNoticeQueueServiceImpl.class);
-	@Autowired
-	private ExamScoreNoticeQueueRepo examScoreNoticeQueueRepo;
-
-	@Override
-	public void addExamScoreNoticeQueue(Long rootOrgId) {
-		log.debug("addExamScoreNoticeQueue.rootOrgId="+rootOrgId);
-		ExamScoreNoticeQueueEntity originalNoticeQueueEntity =GlobalHelper.getEntity(examScoreNoticeQueueRepo,rootOrgId,ExamScoreNoticeQueueEntity.class);
-		if(originalNoticeQueueEntity==null || originalNoticeQueueEntity.getRootOrgId()==null) {			
-			originalNoticeQueueEntity = new ExamScoreNoticeQueueEntity();
-			originalNoticeQueueEntity.setRootOrgId(rootOrgId);
-			originalNoticeQueueEntity.setCreationTime(new Date());
-		}else {
-			return;
-		}
-		examScoreNoticeQueueRepo.save(originalNoticeQueueEntity);
-	}
-	
-	@Override
-	public boolean isExistExamScoreNoticeQueue(Long rootOrgId) {
-		ExamScoreNoticeQueueEntity entity = new ExamScoreNoticeQueueEntity();
-		entity.setRootOrgId(rootOrgId);
-		Example<ExamScoreNoticeQueueEntity> example =Example.of(entity);
-		return examScoreNoticeQueueRepo.exists(example);
-	}
-	
+    private static final Logger log = LoggerFactory.getLogger(ExamScoreNoticeQueueServiceImpl.class);
+
+    @Autowired
+    private ExamScoreNoticeQueueRepo examScoreNoticeQueueRepo;
+
+    @Override
+    public void addExamScoreNoticeQueue(Long rootOrgId) {
+        log.debug("addExamScoreNoticeQueue.rootOrgId=" + rootOrgId);
+        ExamScoreNoticeQueueEntity originalNoticeQueueEntity = GlobalHelper.getEntity(examScoreNoticeQueueRepo, rootOrgId, ExamScoreNoticeQueueEntity.class);
+        if (originalNoticeQueueEntity == null || originalNoticeQueueEntity.getRootOrgId() == null) {
+            originalNoticeQueueEntity = new ExamScoreNoticeQueueEntity();
+            originalNoticeQueueEntity.setRootOrgId(rootOrgId);
+            originalNoticeQueueEntity.setCreationTime(new Date());
+        } else {
+            return;
+        }
+        examScoreNoticeQueueRepo.save(originalNoticeQueueEntity);
+    }
+
+    @Override
+    public boolean isExistExamScoreNoticeQueue(Long rootOrgId) {
+        ExamScoreNoticeQueueEntity entity = new ExamScoreNoticeQueueEntity();
+        entity.setRootOrgId(rootOrgId);
+        Example<ExamScoreNoticeQueueEntity> example = Example.of(entity);
+        return examScoreNoticeQueueRepo.exists(example);
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScorePushQueueServiceImpl.java

@@ -1,16 +1,7 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.util.Date;
-
-import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
-import cn.com.qmth.examcloud.support.enums.ExamProperties;
-import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
-import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
+import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScorePushQueueRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.OrgScoreHandleRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
@@ -19,7 +10,15 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.OrgScoreHandleEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushQueueService;
 import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRuleService;
+import cn.com.qmth.examcloud.support.enums.ExamProperties;
+import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
+import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
 
 /**
  * @author chenken
@@ -78,4 +77,5 @@ public class ExamScorePushQueueServiceImpl implements ExamScorePushQueueService
             }
         }
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScoreQueueServiceImpl.java

@@ -1,11 +1,5 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScorePushQueueRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScorePushQueue;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamScoreQueueStatus;
@@ -13,51 +7,56 @@ import cn.com.qmth.examcloud.core.oe.admin.service.ExamScorePushService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreQueueService;
 import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
 
 
 /**
- * 
- * @author  	chenken
- * @date    	2018年9月10日 上午9:26:24
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年9月10日 上午9:26:24
+ * @company QMTH
  * @description 分数推送队列接口实现
  */
 @Service("examScoreQueueService")
 public class ExamScoreQueueServiceImpl implements ExamScoreQueueService {
 
-	@Autowired
-	private ExamScorePushQueueRepo examScorePushQueueRepo;
-	
-	@Autowired
-	private GainBaseDataService gainBaseDataService;
-	
-	@Override
-	public void disposeScoreQueue(){
-		List<ExamScorePushQueue> examScorePushQueues = examScorePushQueueRepo.findExamScorePushQueue();
-		for(ExamScorePushQueue examScorePushQueue:examScorePushQueues){
-			ExamScorePushService examScorePushService =  (ExamScorePushService) SpringContextHolder.getBean(examScorePushQueue.getServiceName());
-			if(examScorePushService != null){
-				examScorePushService.scorePush(examScorePushQueue);
-			}
-		}
-	}
-
-	@Override
-	public void saveExamScorePushQueue(String returnMsg,ExamScorePushQueue examScorePushQueue,ExamScoreQueueStatus examScoreQueueStatus) {
-		examScorePushQueue.setStatus(examScoreQueueStatus);
-		if(returnMsg != null && returnMsg.length()>500){
-			returnMsg = returnMsg.substring(0,500);
-		}
-		if(examScoreQueueStatus == ExamScoreQueueStatus.PROCESS_SUCCESS){
-			examScorePushQueue.setFailedTimes(0);
-			examScorePushQueue.setErrorMsg(null);
-			examScorePushQueue.setSuccessMsg(returnMsg);
-		}else if(examScoreQueueStatus == ExamScoreQueueStatus.PROCESS_FAILED){
-			int failedTimes = examScorePushQueue.getFailedTimes();
-			examScorePushQueue.setFailedTimes(failedTimes+1);
-			examScorePushQueue.setErrorMsg(returnMsg);
-		}
-		examScorePushQueue.setUpdateTime(new Date());
-		examScorePushQueueRepo.save(examScorePushQueue);
-	}
+    @Autowired
+    private ExamScorePushQueueRepo examScorePushQueueRepo;
+
+    @Autowired
+    private GainBaseDataService gainBaseDataService;
+
+    @Override
+    public void disposeScoreQueue() {
+        List<ExamScorePushQueue> examScorePushQueues = examScorePushQueueRepo.findExamScorePushQueue();
+        for (ExamScorePushQueue examScorePushQueue : examScorePushQueues) {
+            ExamScorePushService examScorePushService = (ExamScorePushService) SpringContextHolder.getBean(examScorePushQueue.getServiceName());
+            if (examScorePushService != null) {
+                examScorePushService.scorePush(examScorePushQueue);
+            }
+        }
+    }
+
+    @Override
+    public void saveExamScorePushQueue(String returnMsg, ExamScorePushQueue examScorePushQueue, ExamScoreQueueStatus examScoreQueueStatus) {
+        examScorePushQueue.setStatus(examScoreQueueStatus);
+        if (returnMsg != null && returnMsg.length() > 500) {
+            returnMsg = returnMsg.substring(0, 500);
+        }
+        if (examScoreQueueStatus == ExamScoreQueueStatus.PROCESS_SUCCESS) {
+            examScorePushQueue.setFailedTimes(0);
+            examScorePushQueue.setErrorMsg(null);
+            examScorePushQueue.setSuccessMsg(returnMsg);
+        } else if (examScoreQueueStatus == ExamScoreQueueStatus.PROCESS_FAILED) {
+            int failedTimes = examScorePushQueue.getFailedTimes();
+            examScorePushQueue.setFailedTimes(failedTimes + 1);
+            examScorePushQueue.setErrorMsg(returnMsg);
+        }
+        examScorePushQueue.setUpdateTime(new Date());
+        examScorePushQueueRepo.save(examScorePushQueue);
+    }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamScoreServiceImpl.java

@@ -7,28 +7,6 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
-import cn.com.qmth.examcloud.support.enums.ExamProperties;
-import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
-import com.google.common.collect.Lists;
-
 import cn.com.qmth.examcloud.core.oe.admin.base.jpa.SpecUtils;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.CommonUtil;
@@ -40,17 +18,33 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentFinalScoreEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamScoreService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentFinalScoreService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
-import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
+import cn.com.qmth.examcloud.core.oe.admin.service.*;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreEntityConvert;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ObjectiveScoreInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo;
+import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
+import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
+import cn.com.qmth.examcloud.support.enums.ExamProperties;
+import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 考试分数相关接口
@@ -60,18 +54,25 @@ import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
  */
 @Service
 public class ExamScoreServiceImpl implements ExamScoreService {
+
     @Autowired
     private ExamScoreRepo examScoreRepo;
+
     @Autowired
     private ExamRecordDataRepo examRecordDataRepo;
+
     @Autowired
     private ExamStudentService examStudentService;
+
     @Autowired
     private ExamRecordService examRecordService;
+
     @Autowired
     private GainBaseDataService gainBaseDataService;
+
     @Autowired
     private JdbcTemplate jdbcTemplate;
+
     @Autowired
     private ExamStudentFinalScoreService examStudentFinalScoreService;
 
@@ -146,20 +147,20 @@ public class ExamScoreServiceImpl implements ExamScoreService {
         String markingType = ExamCacheTransferHelper.
                 getDefaultCachedExamProperty(query.getExamId(), ExamProperties.MARKING_TYPE.name()).getValue();
         if (query.getStartLimit() != null && query.getEndLimit() != null) {
-        	return getExamStudentInfoListOfScoreExport(query, markingType);
-        }else {
-        	List<ExamStudentEntity> examStudentList=new ArrayList<ExamStudentEntity>();
-            Long startId=0L;
-            for(;;) {
-            	List<ExamStudentEntity> tem=getExamStudentInfoListOfScoreExportByPage(query, markingType, startId);
-            	if(tem==null||tem.size()==0) {
-            		break;
-            	}else {
-            		startId=tem.get(tem.size()-1).getId();
-            		examStudentList.addAll(tem);
-            	}
+            return getExamStudentInfoListOfScoreExport(query, markingType);
+        } else {
+            List<ExamStudentEntity> examStudentList = new ArrayList<ExamStudentEntity>();
+            Long startId = 0L;
+            for (; ; ) {
+                List<ExamStudentEntity> tem = getExamStudentInfoListOfScoreExportByPage(query, markingType, startId);
+                if (tem == null || tem.size() == 0) {
+                    break;
+                } else {
+                    startId = tem.get(tem.size() - 1).getId();
+                    examStudentList.addAll(tem);
+                }
             }
-            
+
             List<ExamScoreInfo> examScoreInfoList = new ArrayList<ExamScoreInfo>();
             //缓存
             for (ExamStudentEntity examStudent : examStudentList) {
@@ -174,8 +175,8 @@ public class ExamScoreServiceImpl implements ExamScoreService {
             return examScoreInfoList;
         }
     }
-    
-    private List<ExamStudentEntity> getExamStudentInfoListOfScoreExportByPage(ExamScoreQuery query, String markingType,Long startId) {
+
+    private List<ExamStudentEntity> getExamStudentInfoListOfScoreExportByPage(ExamScoreQuery query, String markingType, Long startId) {
         //查询条件
         StringBuffer sql = new StringBuffer();
         sql.append("select id,exam_student_id,exam_id,course_id,course_code,course_level,finished,student_id,student_code,student_name,identity_number"
@@ -208,7 +209,7 @@ public class ExamScoreServiceImpl implements ExamScoreService {
         if (query.getFinished() != null) {
             sql.append(" and finished= " + query.getFinished());
         }
-        sql.append(" and id >"+startId);
+        sql.append(" and id >" + startId);
         sql.append(" order by id limit 500 ");
 
         List<ExamStudentEntity> examStudentList = jdbcTemplate.query(sql.toString(), new RowMapper<ExamStudentEntity>() {
@@ -220,7 +221,7 @@ public class ExamScoreServiceImpl implements ExamScoreService {
 
         return examStudentList;
     }
-    
+
     @Override
     public List<ExamScoreInfo> exportExamScoreList(ExamScoreQuery query) {
         Check.isNull(query, "查询参数不能为空！");
@@ -537,4 +538,5 @@ public class ExamScoreServiceImpl implements ExamScoreService {
         }
         return false;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class ExamServiceImpl implements ExamService {
+
     @Autowired
     private ExamCloudServiceClient examCloudServiceClient;
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamStudentFinalScoreServiceImpl.java

@@ -30,12 +30,16 @@ import java.util.stream.Collectors;
  */
 @Service("examStudentFinalScoreService")
 public class ExamStudentFinalScoreServiceImpl implements ExamStudentFinalScoreService {
+
     @Autowired
     private ExamRecordDataRepo examRecordDataRepo;
+
     @Autowired
     private ExamScoreRepo examScoreRepo;
+
     @Autowired
     private ExamStudentRepo examStudentRepo;
+
     @Autowired
     private ExamStudentFinalScoreRepo examStudentFinalScoreRepo;
 
@@ -155,4 +159,5 @@ public class ExamStudentFinalScoreServiceImpl implements ExamStudentFinalScoreSe
         }
         return null;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamStudentServiceImpl.java

@@ -7,43 +7,6 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import static cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentMapper.statisticFinishedColumns;
-import static cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentMapper.statisticOrgColumns;
-
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.query.NativeQuery;
-import org.hibernate.transform.Transformers;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Pageable;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-
 import cn.com.qmth.examcloud.api.commons.enums.ExamSpecialSettingsType;
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
@@ -67,20 +30,10 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.FinishStatus;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentFinalScoreService;
-import cn.com.qmth.examcloud.core.oe.admin.service.ExamStudentService;
-import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
-import cn.com.qmth.examcloud.core.oe.admin.service.LocalCacheService;
+import cn.com.qmth.examcloud.core.oe.admin.service.*;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.OnHandExamInfo;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordFileAnswerInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.CourseProgressInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentEntityConvert;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentFinishedStatistic;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentOrgStatistic;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentPartInfo;
-import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentQuery;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.*;
 import cn.com.qmth.examcloud.core.oe.admin.service.cache.ExamStudentCache;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
@@ -91,12 +44,7 @@ import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
-import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamPropertyCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamStageCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
+import cn.com.qmth.examcloud.support.cache.bean.*;
 import cn.com.qmth.examcloud.support.enums.ExamProperties;
 import cn.com.qmth.examcloud.support.examing.ExamBoss;
 import cn.com.qmth.examcloud.support.filestorage.FileStorageUtil;
@@ -104,6 +52,34 @@ import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.support.helper.FaceBiopsyHelper;
 import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.transform.Transformers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentMapper.statisticFinishedColumns;
+import static cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentMapper.statisticOrgColumns;
 
 /**
  * 考生信息接口
@@ -113,37 +89,51 @@ import cn.com.qmth.examcloud.web.redis.RedisClient;
  */
 @Service
 public class ExamStudentServiceImpl implements ExamStudentService {
+
     private static final Logger log = LoggerFactory.getLogger(ExamStudentServiceImpl.class);
-    
+
     @Autowired
     private ExamStudentRepo examStudentRepo;
+
     @Autowired
     private ExamRecordDataRepo examRecordDataRepo;
+
     @Autowired
     private ExamRecordForMarkingRepo examRecordForMarkingRepo;
+
     @Autowired
     private ExamRecordService examRecordService;
+
     @Autowired
     private EntityManager entityManager;
+
     @Autowired
     private GainBaseDataService gainBaseDataService;
+
     @Autowired
     private JdbcTemplate jdbcTemplate;
+
     @Autowired
     private LocalCacheService localCacheService;
+
     @Autowired
     private ExamCloudService examCloudService;
+
     @Autowired
     private RedisClient redisClient;
+
     @Autowired
     private ExamStudentCache examStudentCache;
+
     @Autowired
     private ExamStudentFinalScoreService examStudentFinalScoreService;
 
     @Autowired
     ExamStudentCloudService examStudentCloudService;
+
     @Autowired
     private ExamRecordFileAnswerRepo examRecordFileAnswerRepo;
+
     @Autowired
     private StudentCloudService studentCloudService;
 
@@ -307,21 +297,21 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         Check.isNull(query, "查询参数不能为空！");
         ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getDefaultCachedExam(query.getExamId());
 
-        List<ExamStudentEntity> examStudentList=new ArrayList<ExamStudentEntity>();
-        int pageNo=1;
-        int pageSize=500;
-        for(;;) {
-        	List<ExamStudentEntity> tem=getExamStudentInfoListByPage(query, examBean, pageNo,pageSize);
-        	if(tem==null||tem.size()==0) {
-        		break;
-        	}else {
-        		pageNo++;
-        		examStudentList.addAll(tem);
-        	}
+        List<ExamStudentEntity> examStudentList = new ArrayList<ExamStudentEntity>();
+        int pageNo = 1;
+        int pageSize = 500;
+        for (; ; ) {
+            List<ExamStudentEntity> tem = getExamStudentInfoListByPage(query, examBean, pageNo, pageSize);
+            if (tem == null || tem.size() == 0) {
+                break;
+            } else {
+                pageNo++;
+                examStudentList.addAll(tem);
+            }
         }
         List<ExamStudentInfo> examStudentInfoList = new ArrayList<ExamStudentInfo>();
-        if(examStudentList==null||examStudentList.size()==0) {
-       	 	return examStudentInfoList;
+        if (examStudentList == null || examStudentList.size() == 0) {
+            return examStudentInfoList;
         }
         for (ExamStudentEntity examStudentEntity : examStudentList) {
             ExamStudentInfo examStudentInfo = buildExamStudentInfoForExport(examStudentEntity, examBean.getExamType());
@@ -356,9 +346,9 @@ public class ExamStudentServiceImpl implements ExamStudentService {
             assemblingExamStudentDto(examStudent, now, examStudentDtoList, true);
         }
 
-        for(OnHandExamInfo info:examStudentDtoList) {
+        for (OnHandExamInfo info : examStudentDtoList) {
             ExamPropertyCacheBean examCycleEnabledCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_ENABLED.name());
-            if(examCycleEnabledCache!=null&&StringUtil.isTrue(examCycleEnabledCache.getValue())) {
+            if (examCycleEnabledCache != null && StringUtil.isTrue(examCycleEnabledCache.getValue())) {
                 info.setExamCycleEnabled(true);
 
                 ExamPropertyCacheBean examCycleWeekCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_WEEK.name());
@@ -366,7 +356,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
                 info.setExamCycleWeek(JSONObject.parseArray(examCycleWeekCache.getValue()));
                 ExamPropertyCacheBean examCycleTimeRangeCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_TIME_RANGE.name());
                 info.setExamCycleTimeRange(JSONObject.parseArray(examCycleTimeRangeCache.getValue()));
-            }else {
+            } else {
                 info.setExamCycleEnabled(false);
             }
         }
@@ -374,29 +364,30 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         return examStudentDtoList;
     }
 
-    private void setPhone(List<ExamStudentInfo> dataList,Long rootOrgId) {
-    	GetStudentListByIdsReq req= new GetStudentListByIdsReq();
+    private void setPhone(List<ExamStudentInfo> dataList, Long rootOrgId) {
+        GetStudentListByIdsReq req = new GetStudentListByIdsReq();
         BatchSetDataUtil<ExamStudentInfo> tool = new BatchSetDataUtil<ExamStudentInfo>() {
-			@Override
-			public void setData(List<ExamStudentInfo> dataList) {
-				req.setRootOrgId(rootOrgId);
-				List<Long> ids = dataList.stream().map(dto -> dto.getStudentId()).distinct().collect(Collectors.toList());
-				req.setStudentIdList(ids);
-				GetStudentListByIdsResp resp=studentCloudService.getStudentListByIds(req);
-				if(resp.getStudentBeanList()!=null&&resp.getStudentBeanList().size()>0) {
-					Map<Long, String> map = resp.getStudentBeanList().stream()
-							.collect(Collectors.toMap(StudentBean::getId, account -> (account.getPhoneNumber()==null?"":account.getPhoneNumber())));
-					for(ExamStudentInfo erInfo:dataList) {
-						erInfo.setPhone(map.get(erInfo.getStudentId()));
-					}
-				}
-			}
-
-		};
-		tool.setDataForBatch(dataList, 100);
+            @Override
+            public void setData(List<ExamStudentInfo> dataList) {
+                req.setRootOrgId(rootOrgId);
+                List<Long> ids = dataList.stream().map(dto -> dto.getStudentId()).distinct().collect(Collectors.toList());
+                req.setStudentIdList(ids);
+                GetStudentListByIdsResp resp = studentCloudService.getStudentListByIds(req);
+                if (resp.getStudentBeanList() != null && resp.getStudentBeanList().size() > 0) {
+                    Map<Long, String> map = resp.getStudentBeanList().stream()
+                            .collect(Collectors.toMap(StudentBean::getId, account -> (account.getPhoneNumber() == null ? "" : account.getPhoneNumber())));
+                    for (ExamStudentInfo erInfo : dataList) {
+                        erInfo.setPhone(map.get(erInfo.getStudentId()));
+                    }
+                }
+            }
+
+        };
+        tool.setDataForBatch(dataList, 100);
     }
-    private List<ExamStudentEntity> getExamStudentInfoListByPage(ExamStudentQuery query,ExamSettingsCacheBean examBean,int pageNo,int pageSize) {
-    	//查询条件
+
+    private List<ExamStudentEntity> getExamStudentInfoListByPage(ExamStudentQuery query, ExamSettingsCacheBean examBean, int pageNo, int pageSize) {
+        //查询条件
         StringBuffer sql = new StringBuffer();
         sql.append("select id,exam_student_id,exam_id,course_id,course_code,course_level");
         if ((ExamType.ONLINE.name().equals(examBean.getExamType()) || ExamType.ONLINE_HOMEWORK.name().equals(examBean.getExamType())) && query.getFinished() == null) {
@@ -410,7 +401,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
                 + ",specialty_code,specialty_name,grade from ec_oe_exam_student t1 where 1=1 ");
         sql.append(selectExamStudentConfitionSql(query, examBean.getExamType()));
         int currentNum = (pageNo - 1) * pageSize;
-        sql.append(" order by id limit "+currentNum+","+pageSize);
+        sql.append(" order by id limit " + currentNum + "," + pageSize);
 
         List<ExamStudentEntity> examStudentList = jdbcTemplate.query(sql.toString(), new RowMapper<ExamStudentEntity>() {
             @Override
@@ -418,9 +409,10 @@ public class ExamStudentServiceImpl implements ExamStudentService {
                 return getExamStudentEntityByResultSet(rs);
             }
         });
-        
+
         return examStudentList;
     }
+
     @Override
     public List<ExamStudentInfo> getExamStudentInfoList(ExamStudentQuery query) {
         Check.isNull(query, "查询参数不能为空！");
@@ -502,7 +494,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         }
         if (query.getFinished() != null) {
             if (ExamType.ONLINE.name().equals(examType) || ExamType.ONLINE_HOMEWORK.name().equals(examType)) {
-//                sql.append(" and finished = " + query.getFinished());
+                //                sql.append(" and finished = " + query.getFinished());
                 if (query.getFinished().intValue() == 1) {
                     sql.append(" AND ( finished = 1 OR t1.exam_student_id in ( SELECT t2.exam_student_id FROM ec_oes_exam_record_data t2 WHERE t2.exam_id=" + query.getExamId() + "  )  )");
                 }
@@ -527,12 +519,14 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         }
         return sql;
     }
+
     private ExamStudentInfo buildExamStudentInfoForExport(ExamStudentEntity examStudentEntity, String examType) {
-    	ExamStudentInfo examStudentInfo = buildExamStudentInfoBase(examStudentEntity, examType);
+        ExamStudentInfo examStudentInfo = buildExamStudentInfoBase(examStudentEntity, examType);
         return examStudentInfo;
     }
-    private ExamStudentInfo buildExamStudentInfoBase(ExamStudentEntity examStudentEntity,String examType) {
-    	ExamStudentInfo examStudentInfo = ExamStudentEntityConvert.of(examStudentEntity);
+
+    private ExamStudentInfo buildExamStudentInfoBase(ExamStudentEntity examStudentEntity, String examType) {
+        ExamStudentInfo examStudentInfo = ExamStudentEntityConvert.of(examStudentEntity);
         examStudentInfo.setExamType(examType);
         CourseCacheBean courseBean = ExamCacheTransferHelper.getCachedCourse(examStudentInfo.getCourseId());
         examStudentInfo.setCourseName(courseBean.getName());
@@ -543,8 +537,8 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         examStudentInfo.setOrgCode(orgBean.getCode());
         examStudentInfo.setOrgName(orgBean.getName());
 
-//        String photoNumber = localCacheService.getStudentPhotoNumber(cahcheMap, examStudentInfo.getStudentId());
-//        examStudentInfo.setPhone(photoNumber);//电话号码
+        //        String photoNumber = localCacheService.getStudentPhotoNumber(cahcheMap, examStudentInfo.getStudentId());
+        //        examStudentInfo.setPhone(photoNumber);//电话号码
 
         if (ExamType.ONLINE.name().equals(examType) || ExamType.ONLINE_HOMEWORK.name().equals(examType)) {
             //完成状态
@@ -576,6 +570,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         }
         return examStudentInfo;
     }
+
     private ExamStudentInfo buildExamStudentInfo(ExamStudentEntity examStudentEntity, Map<String, Object> cahcheMap, String examType) {
         ExamStudentInfo examStudentInfo = buildExamStudentInfoBase(examStudentEntity, examType);
         String photoNumber = localCacheService.getStudentPhotoNumber(cahcheMap, examStudentInfo.getStudentId());
@@ -899,7 +894,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
     @Override
     public boolean isEnableExamStudent(Long examStudentId) {
         ExamStudentEntity entity = examStudentRepo.findByExamStudentId(examStudentId);
-        if(entity == null){
+        if (entity == null) {
             log.warn("ExamStudent is not exist, id is " + examStudentId);
             throw new StatusException("000500", "考生信息不存在！");
         }
@@ -1112,19 +1107,19 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         for (ExamStudentEntity examStudent : examStudents) {
             assemblingExamStudentDto(examStudent, now, examStudentDtoList, false);
         }
-        
-        for(OnHandExamInfo info:examStudentDtoList) {
-        	ExamPropertyCacheBean examCycleEnabledCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_ENABLED.name());
-            if(examCycleEnabledCache!=null&&StringUtil.isTrue(examCycleEnabledCache.getValue())) {
-            	info.setExamCycleEnabled(true);
-            	
-            	ExamPropertyCacheBean examCycleWeekCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_WEEK.name());
-            
-            	info.setExamCycleWeek(JSONObject.parseArray(examCycleWeekCache.getValue()));
-            	ExamPropertyCacheBean examCycleTimeRangeCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_TIME_RANGE.name());
-            	info.setExamCycleTimeRange(JSONObject.parseArray(examCycleTimeRangeCache.getValue()));
-            }else {
-            	info.setExamCycleEnabled(false);
+
+        for (OnHandExamInfo info : examStudentDtoList) {
+            ExamPropertyCacheBean examCycleEnabledCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_ENABLED.name());
+            if (examCycleEnabledCache != null && StringUtil.isTrue(examCycleEnabledCache.getValue())) {
+                info.setExamCycleEnabled(true);
+
+                ExamPropertyCacheBean examCycleWeekCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_WEEK.name());
+
+                info.setExamCycleWeek(JSONObject.parseArray(examCycleWeekCache.getValue()));
+                ExamPropertyCacheBean examCycleTimeRangeCache = CacheHelper.getExamProperty(info.getExamId(), ExamProperties.EXAM_CYCLE_TIME_RANGE.name());
+                info.setExamCycleTimeRange(JSONObject.parseArray(examCycleTimeRangeCache.getValue()));
+            } else {
+                info.setExamCycleEnabled(false);
             }
         }
 
@@ -1138,7 +1133,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
 
         ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getCachedExam(examId, studentId, examStageId);
 
-        if (end && !ExamType.ONLINE.name().equals(examBean.getExamType())){
+        if (end && !ExamType.ONLINE.name().equals(examBean.getExamType())) {
             return;
         }
 
@@ -1158,7 +1153,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
             calendar.add(Calendar.DATE, 30);
             Date leftTime = calendar.getTime();
             //已结束且结束时间30天以内的
-            if(now.after(leftTime)||now.before(examBean.getEndTime())){
+            if (now.after(leftTime) || now.before(examBean.getEndTime())) {
                 return;
             }
         } else {
@@ -1283,4 +1278,5 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         GetExamStudentResp resp = examStudentCloudService.getExamStudent(req);
         return resp.getExamStudentBean();
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExportTaskServiceImpl.java

@@ -5,29 +5,6 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.persistence.criteria.Predicate;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserReq;
@@ -46,6 +23,16 @@ import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamMapsReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamMapsResp;
 import cn.com.qmth.examcloud.support.filestorage.FileStorageUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.*;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.persistence.criteria.Predicate;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 导出任务相关接口
@@ -61,11 +48,11 @@ public class ExportTaskServiceImpl implements ExportTaskService {
 
     @Autowired
     private UserCloudService userCloudService;
-    
-    
+
+
     @Override
     public ExportTaskEntity findExportTaskToDispose() {
-    	return exportTaskRepo.findExportTaskToDispose();
+        return exportTaskRepo.findExportTaskToDispose();
     }
 
     @Override
@@ -93,19 +80,19 @@ public class ExportTaskServiceImpl implements ExportTaskService {
     public void updateExportTaskStatus(Long taskId, ExportTaskStatus status) {
         this.updateExportTaskStatus(taskId, status, null, null);
     }
-    
+
     @Transactional
     @Override
     public void startExportTask(Long taskId) {
-    	exportTaskRepo.startExportTask(taskId, ExportTaskStatus.EXPORTING, new Date());
+        exportTaskRepo.startExportTask(taskId, ExportTaskStatus.EXPORTING, new Date());
     }
-    
+
     @Transactional
     @Override
     public void endExportTask(Long taskId) {
-    	exportTaskRepo.endExportTask(taskId,new Date());
+        exportTaskRepo.endExportTask(taskId, new Date());
     }
-    
+
     @Transactional
     @Override
     public void updateExportTaskStatus(Long taskId, ExportTaskStatus status, String statusMsg) {

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/GainBaseDataServiceImpl.java

@@ -2,7 +2,6 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
-import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.SystemPropertyCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
@@ -14,15 +13,9 @@ import cn.com.qmth.examcloud.core.basic.api.response.GetCourseResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetStudentResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetSystemPropertyResp;
 import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
-import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
-import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentReq;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.OrgCacheBean;
@@ -94,7 +87,7 @@ public class GainBaseDataServiceImpl implements GainBaseDataService {
      * @return
      */
     @Override
-    public StudentBean getStudentBean(String studentCode,Long rootOrgId) {
+    public StudentBean getStudentBean(String studentCode, Long rootOrgId) {
         GetStudentReq getStudentReq = new GetStudentReq();
         getStudentReq.setStudentCode(studentCode);
         getStudentReq.setRootOrgId(rootOrgId);

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/IllegallyTypeServiceImpl.java

@@ -52,6 +52,7 @@ public class IllegallyTypeServiceImpl implements IllegallyTypeService {
 
     /**
      * 获取系统级别的违纪类型
+     *
      * @return
      */
     @Override
@@ -66,7 +67,7 @@ public class IllegallyTypeServiceImpl implements IllegallyTypeService {
         Boolean enable = info.getEnable();
         Long rootOrgId = info.getRootOrgId();
         String name = info.getName();
-//        Integer sortNo = info.getSortNo();
+        //        Integer sortNo = info.getSortNo();
         String dataCategory = info.getDataCategory();
 
         if (null == rootOrgId) {
@@ -107,9 +108,9 @@ public class IllegallyTypeServiceImpl implements IllegallyTypeService {
             entity.setName(name);
         }
 
-//        if (null != sortNo) {
-//            entity.setSortNo(sortNo);
-//        }
+        //        if (null != sortNo) {
+        //            entity.setSortNo(sortNo);
+        //        }
         entity.setSortNo(0);
 
         if (StringUtils.isNotEmpty(dataCategory)) {
@@ -189,15 +190,15 @@ public class IllegallyTypeServiceImpl implements IllegallyTypeService {
             }
 
 
-//            //排序号 需求调整，不需要排序号
-//            String sortNo = trimAndNullIfBlank(line[2]);
-//            if (StringUtils.isBlank(code)) {
-//                msg.append("  排序号不能为空");
-//                hasError = true;
-//            } else if (StringUtils.isNumeric(sortNo)) {
-//                msg.append("  排序号必须为正整数的数字");
-//                hasError = true;
-//            }
+            //            //排序号 需求调整，不需要排序号
+            //            String sortNo = trimAndNullIfBlank(line[2]);
+            //            if (StringUtils.isBlank(code)) {
+            //                msg.append("  排序号不能为空");
+            //                hasError = true;
+            //            } else if (StringUtils.isNumeric(sortNo)) {
+            //                msg.append("  排序号必须为正整数的数字");
+            //                hasError = true;
+            //            }
 
             illegallyType.setSortNo(0);
             illegallyType.setDataCategory(DataCategory.CUSTOM);
@@ -221,7 +222,7 @@ public class IllegallyTypeServiceImpl implements IllegallyTypeService {
 
             if (null != existData) {
                 existData.setName(cur.getName());
-//                existData.setSortNo(cur.getSortNo());
+                //                existData.setSortNo(cur.getSortNo());
                 illegallyTypeRepo.save(existData);
             } else {
                 illegallyTypeRepo.save(cur);

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/LocalCacheServiceImpl.java

@@ -1,54 +1,54 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
 import cn.com.qmth.examcloud.core.oe.admin.service.GainBaseDataService;
 import cn.com.qmth.examcloud.core.oe.admin.service.LocalCacheService;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
 
 
 /**
  * 本地缓存服务
- * @author  	chenken
- * @date    	2018年11月15日 下午4:58:44
- * @company 	QMTH
+ *
+ * @author chenken
+ * @date 2018年11月15日 下午4:58:44
+ * @company QMTH
  * @description LocalCacheServiceImpl.java
  */
 @Service("localCacheService")
 public class LocalCacheServiceImpl implements LocalCacheService {
 
-	@Autowired
-	private GainBaseDataService gainBaseDataService;
-
-	@Override
-	public String getStudentPhotoNumber(Map<String, Object> cahcheMap,Long studentId) {
-		String key = Constants.CACHE_PHONE_PREFIX+studentId;
-		String photoNumber = "";
-    	if(cahcheMap.containsKey(key)){
-    		photoNumber = (String) cahcheMap.get(key);
-    	}else{
-			StudentCacheBean studentBean = CacheHelper.getStudent(studentId);
-    		photoNumber = studentBean.getPhoneNumber();
-    		cahcheMap.put(key,photoNumber);
-    	}
-    	return photoNumber;
-	}
-
-	@Override
-	public ExamStudentBean getExamStudentBean(Map<String, Object> cahcheMap,Long examStudentId) {
-		String key = Constants.CACHE_EXAM_STUDENT_PREFIX+examStudentId;
-		ExamStudentBean examStudent = (ExamStudentBean) cahcheMap.get(key);
-    	if(examStudent == null){
-    		examStudent = gainBaseDataService.getExamStudentBean(examStudentId);
-    		cahcheMap.put(key,examStudent);
-    	}
-		return examStudent;
-	}
+    @Autowired
+    private GainBaseDataService gainBaseDataService;
+
+    @Override
+    public String getStudentPhotoNumber(Map<String, Object> cahcheMap, Long studentId) {
+        String key = Constants.CACHE_PHONE_PREFIX + studentId;
+        String photoNumber = "";
+        if (cahcheMap.containsKey(key)) {
+            photoNumber = (String) cahcheMap.get(key);
+        } else {
+            StudentCacheBean studentBean = CacheHelper.getStudent(studentId);
+            photoNumber = studentBean.getPhoneNumber();
+            cahcheMap.put(key, photoNumber);
+        }
+        return photoNumber;
+    }
+
+    @Override
+    public ExamStudentBean getExamStudentBean(Map<String, Object> cahcheMap, Long examStudentId) {
+        String key = Constants.CACHE_EXAM_STUDENT_PREFIX + examStudentId;
+        ExamStudentBean examStudent = (ExamStudentBean) cahcheMap.get(key);
+        if (examStudent == null) {
+            examStudent = gainBaseDataService.getExamStudentBean(examStudentId);
+            cahcheMap.put(key, examStudent);
+        }
+        return examStudent;
+    }
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/OfflineExamServiceImpl.java

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 import cn.com.qmth.examcloud.api.commons.enums.ExamSpecialSettingsType;
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordFileAnswerRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
@@ -19,7 +18,6 @@ import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentB
 import cn.com.qmth.examcloud.core.questions.api.ExtractConfigCloudService;
 import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
 import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
-import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.*;
 import cn.com.qmth.examcloud.support.enums.ExamProperties;
@@ -85,13 +83,13 @@ public class OfflineExamServiceImpl implements OfflineExamService {
 
         List<OfflineExamCourseInfo> offlineExamCourseInfoList = new ArrayList<>();
         for (ExamStudentEntity examStudent : examStudents) {
-            if(!examStudent.getEnable()){
+            if (!examStudent.getEnable()) {
                 log.warn("ExamStudent is disable, id is " + examStudent.getExamStudentId());
                 continue;
             }
 
             ExamSettingsCacheBean examBean =
-                    ExamCacheTransferHelper.getCachedExam(examStudent.getExamId(), studentId,examStudent.getExamStageId());
+                    ExamCacheTransferHelper.getCachedExam(examStudent.getExamId(), studentId, examStudent.getExamStageId());
             if (!ExamType.OFFLINE.name().equals(examBean.getExamType())) {
                 continue;
             }
@@ -213,7 +211,7 @@ public class OfflineExamServiceImpl implements OfflineExamService {
     private ExamSettingsCacheBean checkExam(ExamStudentBean bean) {
         Long examId = bean.getExamId();
         Long studentId = bean.getStudentId();
-        ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getCachedExam(examId, studentId,bean.getExamStageId());
+        ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getCachedExam(examId, studentId, bean.getExamStageId());
 
         //如果启用了了特殊设置，并且无特殊设置时结束考试 配置 设置为true..且实际未设置特殊设置则不允许考试
         ExamPropertyCacheBean limitedIfNoSpecialSettings = ExamCacheTransferHelper.getDefaultCachedExamProperty(examId,
@@ -285,9 +283,9 @@ public class OfflineExamServiceImpl implements OfflineExamService {
 
         examRecordForMarkingService.saveOffLineExamRecordForMarking(bean, fileNewName, pi.getRelativePath());
         if (!StringUtils.isNullOrEmpty(fileType)) {
-            fileType=fileType.toLowerCase();
+            fileType = fileType.toLowerCase();
         }
-        saveExamRecordFileAnswer(examRecordDataId, fileName,fileNewName, pi.getRelativePath(), fileType, fileSuffix);
+        saveExamRecordFileAnswer(examRecordDataId, fileName, fileNewName, pi.getRelativePath(), fileType, fileSuffix);
 
         //更新考试记录状态
         examRecordDataEntity.setExamRecordStatus(ExamRecordStatus.EXAM_END);
@@ -369,12 +367,12 @@ public class OfflineExamServiceImpl implements OfflineExamService {
      *
      * @param examRecordDataId
      * @param originalFileName 原始文件名称
-     * @param fileName 新文件名称
+     * @param fileName         新文件名称
      * @param relativePath
      * @param fileType
      * @param fileSuffix
      */
-    private void saveExamRecordFileAnswer(Long examRecordDataId,String originalFileName,
+    private void saveExamRecordFileAnswer(Long examRecordDataId, String originalFileName,
                                           String fileName, String relativePath,
                                           String fileType, String fileSuffix) {
         //删除原文件
@@ -485,4 +483,5 @@ public class OfflineExamServiceImpl implements OfflineExamService {
 
         return b;
     }
+
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/PracticeServiceImpl.java

@@ -1,27 +1,12 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.alibaba.fastjson.JSONObject;
-
 import cn.com.qmth.examcloud.commons.util.StringUtil;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.QuestionTypeUtil;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamScoreRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamQuestionEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordPaperStructEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordQuestionsEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamScoreEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamStudentEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.*;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamRecordStatus;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordPaperStructService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordQuestionsService;
@@ -39,6 +24,14 @@ import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
 import cn.com.qmth.examcloud.support.enums.ExamProperties;
 import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -80,21 +73,21 @@ public class PracticeServiceImpl implements PracticeService {
         List<PracticeCourseInfo> practiceCourseInfos = new ArrayList<PracticeCourseInfo>();
         for (ExamStudentEntity examStudent : examStudentList) {
             ExamSettingsCacheBean examBean =
-                    ExamCacheTransferHelper.getCachedExam(examId, studentId,examStudent.getExamStageId());
+                    ExamCacheTransferHelper.getCachedExam(examId, studentId, examStudent.getExamStageId());
             practiceCourseInfos.add(buildPracticeCourseInfo(examStudent, examBean));
         }
-        for(PracticeCourseInfo practiceCourseInfo:practiceCourseInfos) {
-        	ExamPropertyCacheBean examCycleEnabledCache = CacheHelper.getExamProperty(practiceCourseInfo.getExamId(), ExamProperties.EXAM_CYCLE_ENABLED.name());
-            if(examCycleEnabledCache!=null&&StringUtil.isTrue(examCycleEnabledCache.getValue())) {
-            	practiceCourseInfo.setExamCycleEnabled(true);
-            	
-            	ExamPropertyCacheBean examCycleWeekCache = CacheHelper.getExamProperty(practiceCourseInfo.getExamId(), ExamProperties.EXAM_CYCLE_WEEK.name());
-            
-            	practiceCourseInfo.setExamCycleWeek(JSONObject.parseArray(examCycleWeekCache.getValue()));
-            	ExamPropertyCacheBean examCycleTimeRangeCache = CacheHelper.getExamProperty(practiceCourseInfo.getExamId(), ExamProperties.EXAM_CYCLE_TIME_RANGE.name());
-            	practiceCourseInfo.setExamCycleTimeRange(JSONObject.parseArray(examCycleTimeRangeCache.getValue()));
-            }else {
-            	practiceCourseInfo.setExamCycleEnabled(false);
+        for (PracticeCourseInfo practiceCourseInfo : practiceCourseInfos) {
+            ExamPropertyCacheBean examCycleEnabledCache = CacheHelper.getExamProperty(practiceCourseInfo.getExamId(), ExamProperties.EXAM_CYCLE_ENABLED.name());
+            if (examCycleEnabledCache != null && StringUtil.isTrue(examCycleEnabledCache.getValue())) {
+                practiceCourseInfo.setExamCycleEnabled(true);
+
+                ExamPropertyCacheBean examCycleWeekCache = CacheHelper.getExamProperty(practiceCourseInfo.getExamId(), ExamProperties.EXAM_CYCLE_WEEK.name());
+
+                practiceCourseInfo.setExamCycleWeek(JSONObject.parseArray(examCycleWeekCache.getValue()));
+                ExamPropertyCacheBean examCycleTimeRangeCache = CacheHelper.getExamProperty(practiceCourseInfo.getExamId(), ExamProperties.EXAM_CYCLE_TIME_RANGE.name());
+                practiceCourseInfo.setExamCycleTimeRange(JSONObject.parseArray(examCycleTimeRangeCache.getValue()));
+            } else {
+                practiceCourseInfo.setExamCycleEnabled(false);
             }
         }
         return practiceCourseInfos;

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/pushscore/bean/ExamScorePushInfo.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.pushscore.bean;
 
-import java.util.Date;
-
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
+import java.util.Date;
+
 /**
- * 
  * @author chenken
  * @date 2018年10月15日 下午4:05:20
  * @company QMTH
@@ -13,178 +12,178 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
  */
 public class ExamScorePushInfo implements JsonSerializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -5176922468872092382L;
+    /**
+     *
+     */
+    private static final long serialVersionUID = -5176922468872092382L;
 
-	private String examName;
+    private String examName;
 
-	private Long examId;
+    private Long examId;
 
-	private String studentName;
+    private String studentName;
 
-	private String studentCode;
+    private String studentCode;
 
-	private String identityNumber;
+    private String identityNumber;
 
-	private String courseName;
+    private String courseName;
 
-	private String courseCode;
+    private String courseCode;
 
-	private Date startTime;
+    private Date startTime;
 
-	private Date endTime;
+    private Date endTime;
 
-	/**
-	 * 人脸检测通过率
-	 */
-	private Double succPercent;
+    /**
+     * 人脸检测通过率
+     */
+    private Double succPercent;
 
-	/**
-	 * 是否缺考
-	 */
-	private Boolean isMissExam;
+    /**
+     * 是否缺考
+     */
+    private Boolean isMissExam;
 
-	private Long scoreId;
+    private Long scoreId;
 
-	private Double totalScore;
+    private Double totalScore;
 
-	private Double objectiveScore;
+    private Double objectiveScore;
 
-	private Double subjectiveScore;
+    private Double subjectiveScore;
 
-	/**
-	 * 是否违纪
-	 */
-	private Boolean isIllegality;
+    /**
+     * 是否违纪
+     */
+    private Boolean isIllegality;
 
-	public Long getExamId() {
-		return examId;
-	}
+    public Long getExamId() {
+        return examId;
+    }
 
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
 
-	public String getStudentName() {
-		return studentName;
-	}
+    public String getStudentName() {
+        return studentName;
+    }
 
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
 
-	public String getStudentCode() {
-		return studentCode;
-	}
+    public String getStudentCode() {
+        return studentCode;
+    }
 
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
 
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
 
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
 
-	public String getCourseName() {
-		return courseName;
-	}
+    public String getCourseName() {
+        return courseName;
+    }
 
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
 
-	public String getCourseCode() {
-		return courseCode;
-	}
+    public String getCourseCode() {
+        return courseCode;
+    }
 
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
 
-	public Date getStartTime() {
-		return startTime;
-	}
+    public Date getStartTime() {
+        return startTime;
+    }
 
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
 
-	public Date getEndTime() {
-		return endTime;
-	}
+    public Date getEndTime() {
+        return endTime;
+    }
 
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
 
-	public Double getSuccPercent() {
-		return succPercent;
-	}
+    public Double getSuccPercent() {
+        return succPercent;
+    }
 
-	public void setSuccPercent(Double succPercent) {
-		this.succPercent = succPercent;
-	}
+    public void setSuccPercent(Double succPercent) {
+        this.succPercent = succPercent;
+    }
 
-	public Long getScoreId() {
-		return scoreId;
-	}
+    public Long getScoreId() {
+        return scoreId;
+    }
 
-	public void setScoreId(Long scoreId) {
-		this.scoreId = scoreId;
-	}
+    public void setScoreId(Long scoreId) {
+        this.scoreId = scoreId;
+    }
 
-	public Double getTotalScore() {
-		return totalScore;
-	}
+    public Double getTotalScore() {
+        return totalScore;
+    }
 
-	public void setTotalScore(Double totalScore) {
-		this.totalScore = totalScore;
-	}
+    public void setTotalScore(Double totalScore) {
+        this.totalScore = totalScore;
+    }
 
-	public Double getObjectiveScore() {
-		return objectiveScore;
-	}
+    public Double getObjectiveScore() {
+        return objectiveScore;
+    }
 
-	public void setObjectiveScore(Double objectiveScore) {
-		this.objectiveScore = objectiveScore;
-	}
-
-	public Double getSubjectiveScore() {
-		return subjectiveScore;
-	}
+    public void setObjectiveScore(Double objectiveScore) {
+        this.objectiveScore = objectiveScore;
+    }
+
+    public Double getSubjectiveScore() {
+        return subjectiveScore;
+    }
 
-	public void setSubjectiveScore(Double subjectiveScore) {
-		this.subjectiveScore = subjectiveScore;
-	}
+    public void setSubjectiveScore(Double subjectiveScore) {
+        this.subjectiveScore = subjectiveScore;
+    }
 
-	public Boolean getIsIllegality() {
-		return isIllegality;
-	}
+    public Boolean getIsIllegality() {
+        return isIllegality;
+    }
 
-	public void setIsIllegality(Boolean isIllegality) {
-		this.isIllegality = isIllegality;
-	}
+    public void setIsIllegality(Boolean isIllegality) {
+        this.isIllegality = isIllegality;
+    }
 
-	public String getExamName() {
-		return examName;
-	}
+    public String getExamName() {
+        return examName;
+    }
 
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
 
-	public Boolean getIsMissExam() {
-		return isMissExam;
-	}
+    public Boolean getIsMissExam() {
+        return isMissExam;
+    }
 
-	public void setIsMissExam(Boolean isMissExam) {
-		this.isMissExam = isMissExam;
-	}
+    public void setIsMissExam(Boolean isMissExam) {
+        this.isMissExam = isMissExam;
+    }
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/scorepushrule/ExamScorePushRuleService.java

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 
 /**
- * 
  * @author chenken
  * @date 2018年9月8日 上午11:16:50
  * @company QMTH
@@ -11,12 +10,12 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
  */
 public interface ExamScorePushRuleService {
 
-	/**
-	 * 需要满足的推送成绩规则
-	 * 
-	 * @param scorePushReq
-	 * @return
-	 */
-	public boolean pushScoreRule(ExamRecordDataEntity examRecordData);
+    /**
+     * 需要满足的推送成绩规则
+     *
+     * @param scorePushReq
+     * @return
+     */
+    public boolean pushScoreRule(ExamRecordDataEntity examRecordData);
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/scorepushrule/cugr/CugrExamScorePushRuleServiceImpl.java

@@ -1,12 +1,10 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.cugr;
 
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRuleService;
+import org.springframework.stereotype.Service;
 
 /**
- * 
  * @author chenken
  * @date 2018年10月18日 下午4:08:51
  * @company QMTH
@@ -15,17 +13,17 @@ import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRu
 @Service("cugrExamScorePushRuleServiceImpl")
 public class CugrExamScorePushRuleServiceImpl implements ExamScorePushRuleService {
 
-	@Override
-	public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {
-		// 违纪
-		if (examRecordData.getIsIllegality()) {
-			return false;
-		}
-		// 有警告且未审核
-		if (examRecordData.getIsWarn() && !examRecordData.getIsAudit()) {
-			return false;
-		}
-		return true;
-	}
+    @Override
+    public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {
+        // 违纪
+        if (examRecordData.getIsIllegality()) {
+            return false;
+        }
+        // 有警告且未审核
+        if (examRecordData.getIsWarn() && !examRecordData.getIsAudit()) {
+            return false;
+        }
+        return true;
+    }
 
 }

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/scorepushrule/cup/CupExamScorePushRuleServiceImpl.java

@@ -1,12 +1,10 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.cup;
 
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRuleService;
+import org.springframework.stereotype.Service;
 
 /**
- * 
  * @author chenken
  * @date 2018年10月18日 下午4:09:26
  * @company QMTH
@@ -15,17 +13,17 @@ import cn.com.qmth.examcloud.core.oe.admin.service.scorepushrule.ExamScorePushRu
 @Service("cupExamScorePushRuleServiceImpl")
 public class CupExamScorePushRuleServiceImpl implements ExamScorePushRuleService {
 
-	@Override
-	public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {
-		// 违纪
-		if (examRecordData.getIsIllegality()) {
-			return false;
-		}
-		// 有警告且未审核
-		if (examRecordData.getIsWarn() && !examRecordData.getIsAudit()) {
-			return false;
-		}
-		return true;
-	}
+    @Override
+    public boolean pushScoreRule(ExamRecordDataEntity examRecordData) {
+        // 违纪
+        if (examRecordData.getIsIllegality()) {
+            return false;
+        }
+        // 有警告且未审核
+        if (examRecordData.getIsWarn() && !examRecordData.getIsAudit()) {
+            return false;
+        }
+        return true;
+    }
 
 }