监考已审导出

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamAuditController.java

@@ -13,6 +13,8 @@ import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
+import cn.com.qmth.examcloud.core.oe.admin.service.AsyncExportService;
+import cn.com.qmth.examcloud.core.oe.admin.service.util.AsyncExportConcurrentUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -72,6 +74,9 @@ public class ExamAuditController extends ControllerSupport {
     @Autowired
     private IllegallyTypeRepo illegallyTypeRepo;
 
+    @Autowired
+    private AsyncExportService asyncExportService;
+
     @PostMapping("/list")
     @ApiOperation(value = "查询“监考已审”列表(分页)")
     public Page<ExamAuditInfo> getExamAuditList(@RequestBody ExamAuditQuery query) {
@@ -85,6 +90,15 @@ public class ExamAuditController extends ControllerSupport {
         return examAuditList;
     }
 
+    @GetMapping("export/async")
+    @ApiOperation(value = "导出“监考已审”(异步)")
+    public void exportExamAuditList(@RequestParam String query) {
+        User user=getAccessUser();
+        asyncExportService.exportExamAuditList(query, user);
+        AsyncExportConcurrentUtil.checkOrStartJob();
+        ReportsUtil.report(new AdminOperateReport(user.getRootOrgId(), user.getUserId(), "监考已审-导出","导出条件:"+query));
+    }
+
     @PostMapping("/discipline/list")
     @ApiOperation(value = "查询“违纪名单”列表(分页)")
     public Page<ExamAuditInfo> getExamAuditUnPassList(@RequestBody ExamAuditQuery query) {

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/ExamRecordController.java

@@ -96,15 +96,6 @@ public class ExamRecordController extends ControllerSupport {
         return examRecordWaitingAuditList;
     }
 
-    @GetMapping("/waiting/audit/export/async")
-    @ApiOperation(value = "导出“监考待审”(异步)")
-    public void exportWaitingAudit(@RequestParam String query, HttpServletResponse response) {
-        User user=getAccessUser();
-        asyncExportService.exportWaitingAudit(query, user);
-        AsyncExportConcurrentUtil.checkOrStartJob();
-        ReportsUtil.report(new AdminOperateReport(user.getRootOrgId(), user.getUserId(), "监考待审-导出","导出条件:"+query));
-    }
-
     @PostMapping("/waiting/audit/next")
     @ApiOperation(value = "查询“监考待审”下一条记录")
     public Long getExamRecordWaitingAuditNextId(@RequestBody ExamRecordQuery query,

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/enums/ExportTaskType.java

@@ -12,7 +12,7 @@ public enum ExportTaskType {
 
     EXAM_DETAIL("考试明细"),
 
-    WAITING_AUDIT("监考待审"),
+    AUDIT("监考已审"),
 
     SCORE_STATISTIC("成绩统计"),
     

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

@@ -6,6 +6,7 @@
 package cn.com.qmth.examcloud.core.oe.admin.service;
 
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentQuery;
@@ -21,7 +22,7 @@ public interface AsyncExportService {
     
     void exportExamScheduling(String jsonParams,User user);
 
-    void exportWaitingAudit(String query, User user);
+    void exportExamAuditList(String query, User user);
 
 	void asyncExportExamScheduling(Long taskId, ExamStudentQuery req);
 
@@ -29,5 +30,5 @@ public interface AsyncExportService {
 
 	void asyncExportExamScoreStatistics(Long taskId, ExamScoreQuery req);
 
-    void asyncExportWaitingAudit(Long taskId, ExamRecordQuery 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

@@ -34,6 +34,14 @@ public interface ExamAuditService {
      */
     Page<ExamAuditInfo> getExamAuditList(ExamAuditQuery query);
 
+    /**
+     * 查询监考已审列表
+     *
+     * @param query
+     * @return
+     */
+    List<ExamAuditInfo> getExamAudit(ExamAuditQuery query);
+
 
     /**
      * 获取审核信息

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

@@ -8,6 +8,7 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit;
 
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
+import cn.com.qmth.examcloud.support.excel.ExcelProperty;
 
 /**
  * 监考已审信息
@@ -25,6 +26,7 @@ public class ExamAuditInfo implements JsonSerializable {
      */
     private Long id;
 
+    @ExcelProperty(name = "考试记录id", width = 30, index = 1)
     private Long examRecordDataId;
 
     /**
@@ -40,6 +42,7 @@ public class ExamAuditInfo implements JsonSerializable {
     /**
      * 审核人姓名
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 4)
     private String auditUserName;
 
     /**
@@ -65,14 +68,17 @@ public class ExamAuditInfo implements JsonSerializable {
     /**
      * 学号
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 4)
     private String studentCode;
     /**
      * 学生姓名
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 2)
     private String studentName;
     /**
      * 身份证号
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 3)
     private String identityNumber;
     /**
      * 课程ID
@@ -85,10 +91,12 @@ public class ExamAuditInfo implements JsonSerializable {
     /**
      * 课程名称
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 5)
     private String courseName;
     /**
      * 课程层次
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 6)
     private String courseLevel;
     /**
      * 学习中心ID
@@ -121,6 +129,7 @@ public class ExamAuditInfo implements JsonSerializable {
     /**
      * 第几次考试
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 11)
     private Integer examOrder;
     /**
      * 是否为重考
@@ -137,6 +146,7 @@ public class ExamAuditInfo implements JsonSerializable {
     /**
      * 抓拍比对成功次数
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 8)
     private Integer faceSuccessCount;
     /**
      * 抓拍比对失败次数
@@ -145,10 +155,12 @@ public class ExamAuditInfo implements JsonSerializable {
     /**
      * 抓拍存在陌生人的次数
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 9)
     private Integer faceStrangerCount;
     /**
      * 抓拍比对总次数
      */
+    @ExcelProperty(name = "考试记录id", width = 30, index = 7)
     private Integer faceTotalCount;
     /**
      * 抓拍比对成功比率

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

@@ -6,6 +6,7 @@ import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExportTaskEntity;
 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.ExportTaskService;
+import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examrecord.ExamRecordQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examscore.ExamScoreQuery;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examstudent.ExamStudentQuery;
@@ -47,8 +48,8 @@ public class ExportTask extends Thread {
 					examScores(et);
 				} else if (ExportTaskType.EXAM_SCHEDULING.equals(et.getType())) {
 					examScheduling(et);
-				} else if (ExportTaskType.WAITING_AUDIT.equals(et.getType())) {
-					examWaitingAudit(et);
+				} else if (ExportTaskType.AUDIT.equals(et.getType())) {
+					examAudit(et);
 				}
 				exportTaskService.endExportTask(et.getId());
 			} catch (Exception e) {
@@ -60,14 +61,14 @@ public class ExportTask extends Thread {
 	}
 
 	/**
-	 * 监考待审
+	 * 监考已审
 	 *
 	 * @param et
 	 */
-	private void examWaitingAudit(ExportTaskEntity et) {
-		ExamRecordQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamRecordQuery.class);
+	private void examAudit(ExportTaskEntity et) {
+		ExamAuditQuery req = new JsonMapper().parseJson(et.getExportParam(), ExamAuditQuery.class);
 		req.setRootOrgId(et.getRootOrgId());
-		asyncExportService.asyncExportWaitingAudit(et.getId(), req);
+		asyncExportService.asyncExportExamAuditList(et.getId(), req);
 	}
 
 	/**

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

@@ -14,7 +14,10 @@ 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;
@@ -77,7 +80,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 	private ExamStudentService examStudentService;
 
 	@Autowired
-	private ExamCaptureService examCaptureService;
+	private ExamAuditService examAuditService;
 
 	@Override
 	public void exportExamScheduling(String jsonParams, User user) {
@@ -303,22 +306,18 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 	}
 
 	@Override
-	public void asyncExportWaitingAudit(Long taskId, ExamRecordQuery req) {
-		List<ExamRecordInfo> examRecords;
+	public void asyncExportExamAuditList(Long taskId, ExamAuditQuery req) {
+		List<ExamAuditInfo> auditInfos;
 		try {
-			examRecords = examRecordService.getExamRecordWaitingAudit(req);
+			auditInfos = examAuditService.getExamAudit(req);
 
-			if (CollectionUtils.isEmpty(examRecords)) {
+			if (CollectionUtils.isEmpty(auditInfos)) {
 				exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "当前条件暂无数据，任务终止");
 				return;
 			}
-			String examType = examRecords.get(0).getExamType();
-			for (ExamRecordInfo examRecordInfo : examRecords) {
-				examRecordInfo.setIdentityNumber(
-						IdentityNumberHelper.conceal(examRecordInfo.getRootOrgId(), examRecordInfo.getIdentityNumber()));
-				if (ExamType.ONLINE.name().equals(examType) || ExamType.ONLINE_HOMEWORK.name().equals(examType)) {
-					examRecordInfo.setVirtualCameraNames(examCaptureService.getVirtualCameraNames(examRecordInfo.getDataId()));
-				}
+			for (ExamAuditInfo examAuditInfo : auditInfos) {
+				examAuditInfo.setIdentityNumber(
+						IdentityNumberHelper.conceal(req.getRootOrgId(), examAuditInfo.getIdentityNumber()));
 			}
 
 		} catch (Exception e) {
@@ -332,8 +331,8 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			return;
 		}
 		// 导出文件的存储路径
-		String examName = examRecords.get(0).getExamName();
-		final String filePath = String.format("/%s/%s/%s/%s/%s_监考待审.xlsx", TASK_EXPORT_DIR, req.getRootOrgId(),
+		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);
@@ -347,7 +346,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 		}
 		try (FileOutputStream out = new FileOutputStream(tempFile);) {
 
-			ExcelExportUtil.exportExcel(ExamRecordInfo.class, examRecords, out);
+			ExcelExportUtil.exportExcel(ExamAuditInfo.class, auditInfos, out);
 
 			// 上传至文件服务器
 			FileStoragePathEnvInfo env = new FileStoragePathEnvInfo();
@@ -355,10 +354,10 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 			env.setRelativePath(filePath);
 			YunPathInfo oss = FileStorageUtil.saveFile(TASK_EXPORT_DIR, env, tempFile, null);
 
-			LOG.info("asyncExportWaitingAudit finished... " + oss.getRelativePath());
+			LOG.info("asyncExportExamAuditList finished... " + oss.getRelativePath());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.SUCCESS, null, oss.getRelativePath());
 		} catch (Exception e) {
-			LOG.info("asyncExportWaitingAudit error... " + e.getMessage());
+			LOG.info("asyncExportExamAuditList error... " + e.getMessage());
 			exportTaskService.updateExportTaskStatus(taskId, ExportTaskStatus.ERROR, "上传至文件服务器异常");
 		} finally {
 			FileUtils.deleteQuietly(tempFile);
@@ -366,7 +365,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 	}
 
 	@Override
-	public void exportWaitingAudit(String query, User user) {
+	public void exportExamAuditList(String query, User user) {
 		ExamStudentQuery req = new JsonMapper().parseJson(query, ExamStudentQuery.class);
 		req.setRootOrgId(user.getRootOrgId());
 		Check.isNull(req, "请求参数不能为空！");
@@ -376,7 +375,7 @@ public class AsyncExportServiceImpl implements AsyncExportService {
 		ExportTaskInfo task = new ExportTaskInfo();
 		task.setRootOrgId(user.getRootOrgId());
 		task.setExamId(req.getExamId());
-		task.setType(ExportTaskType.WAITING_AUDIT);
+		task.setType(ExportTaskType.AUDIT);
 		task.setStatus(ExportTaskStatus.WAITING);
 		task.setCreator(user.getUserId());
 		task.setJsonParams(query);

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

@@ -118,6 +118,112 @@ public class ExamAuditServiceImpl implements ExamAuditService {
         Check.isNull(query.getExamId(), "请先选择考试批次！");
         //封装查询条件
         Pageable pageable = SpecUtils.buildPageable(query.getPageNo(), query.getPageSize());
+
+        final String columns = ExamAuditMapper.defaultColumns();
+        SqlWrapper wrapper = getSqlWrapper(query);
+
+        long totalSize = 0;
+        //查询总记录数
+        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," ");
+            Query countQuery = entityManager.createNativeQuery(countSql);
+            BigInteger element = (BigInteger) countQuery.getSingleResult();
+            totalSize = element.longValue();
+            if (totalSize == 0) {
+                return new PageImpl<>(Lists.newArrayList(), pageable, totalSize);
+            }
+        }
+
+        wrapper.groupBy("record.id ");
+        //查询分页记录
+        wrapper.orderBy("record.update_time", true);//需求调整20200816：按审核时间排序
+        Query dataQuery = entityManager.createNativeQuery(wrapper.build());
+
+//        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());
+            dataQuery.setMaxResults(pageable.getPageSize());
+        }
+        List resultList = dataQuery.getResultList();
+
+        List<ExamAuditInfo> list = ExamAuditEntityConvert.of(resultList);
+
+        for (ExamAuditInfo examAuditInfo : list) {
+            OrgCacheBean orgBean = gainBaseDataService.getOrgBean(examAuditInfo.getOrgId());
+            examAuditInfo.setOrgName(orgBean.getName());
+
+            //将违纪类型重赋值为文本，万恶的历史原因，不该这么做的。TODO 待优化
+            if (StringUtils.isNotEmpty(examAuditInfo.getDisciplineType())) {
+                IllegallyTypeEntity illegallyType = illegallyTypeService.getIllegallyType(orgBean.getRootId(), examAuditInfo.getDisciplineType());
+                examAuditInfo.setDisciplineType(illegallyType.getName());
+            }
+
+
+            CourseCacheBean courseBean = ExamCacheTransferHelper.getCachedCourse(examAuditInfo.getCourseId());
+            examAuditInfo.setCourseName(courseBean.getName());
+            examAuditInfo.setCourseCode(courseBean.getCode());
+            examAuditInfo.setCourseLevel(CourseLevel.getCourseLevel(courseBean.getLevel()).getTitle());
+
+            //考试名称
+            ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getDefaultCachedExam(query.getExamId());
+            examAuditInfo.setExamName(examBean.getName());
+
+            //客观分
+            ExamScoreEntity examScore = examScoreRepo.findByExamRecordDataId(examAuditInfo.getExamRecordDataId());
+            examAuditInfo.setObjectiveScore(String.valueOf(examScore.getObjectiveScore()));
+
+        }
+        return new PageImpl<ExamAuditInfo>(list, pageable, totalSize);
+    }
+
+    @Override
+    public List<ExamAuditInfo> getExamAudit(ExamAuditQuery query) {
+        Check.isNull(query, "查询参数不能为空！");
+        Check.isNull(query.getExamId(), "请先选择考试批次！");
+
+        SqlWrapper wrapper = getSqlWrapper(query);
+
+        wrapper.groupBy("record.id ");
+        //查询分页记录
+        wrapper.orderBy("record.update_time", true);//需求调整20200816：按审核时间排序
+        Query dataQuery = entityManager.createNativeQuery(wrapper.build());
+
+        List resultList = dataQuery.getResultList();
+
+        List<ExamAuditInfo> list = ExamAuditEntityConvert.of(resultList);
+
+        for (ExamAuditInfo examAuditInfo : list) {
+            OrgCacheBean orgBean = gainBaseDataService.getOrgBean(examAuditInfo.getOrgId());
+            examAuditInfo.setOrgName(orgBean.getName());
+
+            //将违纪类型重赋值为文本，万恶的历史原因，不该这么做的。TODO 待优化
+            if (StringUtils.isNotEmpty(examAuditInfo.getDisciplineType())) {
+                IllegallyTypeEntity illegallyType = illegallyTypeService.getIllegallyType(orgBean.getRootId(), examAuditInfo.getDisciplineType());
+                examAuditInfo.setDisciplineType(illegallyType.getName());
+            }
+
+            CourseCacheBean courseBean = ExamCacheTransferHelper.getCachedCourse(examAuditInfo.getCourseId());
+            examAuditInfo.setCourseName(courseBean.getName());
+            examAuditInfo.setCourseCode(courseBean.getCode());
+            examAuditInfo.setCourseLevel(CourseLevel.getCourseLevel(courseBean.getLevel()).getTitle());
+
+            //考试名称
+            ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getDefaultCachedExam(query.getExamId());
+            examAuditInfo.setExamName(examBean.getName());
+
+            //客观分
+            ExamScoreEntity examScore = examScoreRepo.findByExamRecordDataId(examAuditInfo.getExamRecordDataId());
+            examAuditInfo.setObjectiveScore(String.valueOf(examScore.getObjectiveScore()));
+
+        }
+        return list;
+    }
+
+
+    private SqlWrapper getSqlWrapper(ExamAuditQuery query){
         final String columns = ExamAuditMapper.defaultColumns();
         SqlWrapper wrapper = new SqlWrapper()
                 .select(columns).from("ec_oe_exam_audit").as("audit")
@@ -177,62 +283,7 @@ public class ExamAuditServiceImpl implements ExamAuditService {
             wrapper.and().gte("audit.update_time", query.getAuditStartTime());
             wrapper.and().lte("audit.update_time", query.getAuditEndTime());
         }
-
-        long totalSize = 0;
-        //查询总记录数
-        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," ");
-            Query countQuery = entityManager.createNativeQuery(countSql);
-            BigInteger element = (BigInteger) countQuery.getSingleResult();
-            totalSize = element.longValue();
-            if (totalSize == 0) {
-                return new PageImpl<>(Lists.newArrayList(), pageable, totalSize);
-            }
-        }
-
-        wrapper.groupBy("record.id ");
-        //查询分页记录
-        wrapper.orderBy("record.update_time", true);//需求调整20200816：按审核时间排序
-        Query dataQuery = entityManager.createNativeQuery(wrapper.build());
-
-//        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());
-            dataQuery.setMaxResults(pageable.getPageSize());
-        }
-        List resultList = dataQuery.getResultList();
-
-        List<ExamAuditInfo> list = ExamAuditEntityConvert.of(resultList);
-
-        for (ExamAuditInfo examAuditInfo : list) {
-            OrgCacheBean orgBean = gainBaseDataService.getOrgBean(examAuditInfo.getOrgId());
-            examAuditInfo.setOrgName(orgBean.getName());
-
-            //将违纪类型重赋值为文本，万恶的历史原因，不该这么做的。TODO 待优化
-            if (StringUtils.isNotEmpty(examAuditInfo.getDisciplineType())) {
-                IllegallyTypeEntity illegallyType = illegallyTypeService.getIllegallyType(orgBean.getRootId(), examAuditInfo.getDisciplineType());
-                examAuditInfo.setDisciplineType(illegallyType.getName());
-            }
-
-
-            CourseCacheBean courseBean = ExamCacheTransferHelper.getCachedCourse(examAuditInfo.getCourseId());
-            examAuditInfo.setCourseName(courseBean.getName());
-            examAuditInfo.setCourseCode(courseBean.getCode());
-            examAuditInfo.setCourseLevel(CourseLevel.getCourseLevel(courseBean.getLevel()).getTitle());
-
-            //考试名称
-            ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getDefaultCachedExam(query.getExamId());
-            examAuditInfo.setExamName(examBean.getName());
-
-            //客观分
-            ExamScoreEntity examScore = examScoreRepo.findByExamRecordDataId(examAuditInfo.getExamRecordDataId());
-            examAuditInfo.setObjectiveScore(String.valueOf(examScore.getObjectiveScore()));
-
-        }
-        return new PageImpl<ExamAuditInfo>(list, pageable, totalSize);
+        return wrapper;
     }
 
     @Override