update.

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

@@ -1,10 +1,3 @@
-/*
- * *************************************************
- * Copyright (c) 2018 QMTH. All Rights Reserved.
- * Created by Deason on 2018-08-27 16:27:13.
- * *************************************************
- */
-
 package cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit;
 
 import java.math.BigDecimal;
@@ -14,18 +7,14 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.converters.*;
 import org.apache.commons.collections.CollectionUtils;
-import org.springframework.data.domain.Page;
 
 import com.google.common.collect.Lists;
 import com.mysql.cj.util.StringUtils;
 
 import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
-import cn.com.qmth.examcloud.commons.util.DateUtil;
 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.IsSuccess;
-import cn.com.qmth.examcloud.support.cache.CacheHelper;
-import cn.com.qmth.examcloud.support.cache.bean.ExamStageCacheBean;
 
 /**
  * 类信息转换
@@ -85,22 +74,13 @@ public class ExamAuditEntityConvert {
 			ExamAuditExcel excel = new ExamAuditExcel();
 			excel.setExamId(e.getExamId());
 			excel.setExamRecordDataId(e.getExamRecordDataId());
-			/*
-			 * DisciplineType disciplineType =
-			 * DisciplineType.tramsformByType(e.getDisciplineType());
-			 * if(disciplineType!=null){ excel.setDisciplineType(disciplineType.getName());
-			 * }
-			 */
+
 			excel.setExamStageId(e.getExamStageId());
-			if(excel.getExamStageId()!=null) {
-    			ExamStageCacheBean stage=CacheHelper.getExamStage(excel.getExamId(), excel.getExamStageId());
-    			excel.setExamStageOrder(stage.getStageOrder());
-    			excel.setStartTime(stage.getStartTime());
-    			excel.setEndTime(stage.getEndTime());
-    			excel.setExamStage(stage.getStageOrder() + "("
-						+ DateUtil.format(stage.getStartTime(), DateUtil.DatePatterns.CHINA_DEFAULT) + "至"
-						+ DateUtil.format(stage.getEndTime(), DateUtil.DatePatterns.CHINA_DEFAULT) + ")");
-    		}
+			excel.setExamStageOrder(e.getExamStageOrder());
+			excel.setStartTime(e.getStartTime());
+			excel.setEndTime(e.getEndTime());
+			excel.setExamStage(e.getExamStage());
+
 			excel.setOrgName(e.getOrgName());
 			excel.setDisciplineType(e.getDisciplineType());
 			excel.setExamName(e.getExamName());