updateTimeDesc;

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

@@ -90,9 +90,13 @@ public class ExamAuditQuery implements JsonSerializable {
 	@ApiModelProperty("Ip")
 	private String ip;
 
+	@ApiModelProperty("更新时间倒序")
+	private Boolean updateTimeDesc;
+
 	/**
 	 * 查询或导出 select export
 	 */
+	@ApiModelProperty(hidden = true)
 	private SelectType selectType;
 
 	@ApiModelProperty("切屏次数起始")
@@ -100,6 +104,7 @@ public class ExamAuditQuery implements JsonSerializable {
 
 	@ApiModelProperty("切屏次数截止")
 	private Integer switchScreenCountEnd;
+
 	@ApiModelProperty(hidden = true)
 	private Long taskId;
 
@@ -323,4 +328,12 @@ public class ExamAuditQuery implements JsonSerializable {
 		this.auditType = auditType;
 	}
 
+	public Boolean getUpdateTimeDesc() {
+		return updateTimeDesc;
+	}
+
+	public void setUpdateTimeDesc(Boolean updateTimeDesc) {
+		this.updateTimeDesc = updateTimeDesc;
+	}
+
 }

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

@@ -133,6 +133,9 @@ public class ExamRecordQuery implements JsonSerializable {
 	@ApiModelProperty("异常类型")
 	private String warnType;
 
+	@ApiModelProperty("更新时间倒序")
+	private Boolean updateTimeDesc;
+
 	public ExamRecordQuery addRecordStatus(String recordStatus) {
 		if (recordStatuses == null) {
 			recordStatuses = new ArrayList<>();
@@ -444,4 +447,12 @@ public class ExamRecordQuery implements JsonSerializable {
 		this.warnType = warnType;
 	}
 
+	public Boolean getUpdateTimeDesc() {
+		return updateTimeDesc;
+	}
+
+	public void setUpdateTimeDesc(Boolean updateTimeDesc) {
+		this.updateTimeDesc = updateTimeDesc;
+	}
+
 }

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

@@ -8,7 +8,6 @@ import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 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.core.oe.admin.dao.enums.SelectType;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordAlreadyAuditService;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExportTaskService;
 import cn.com.qmth.examcloud.core.oe.admin.service.IllegallyTypeService;
@@ -90,7 +89,6 @@ public class ExamRecordAlreadyAuditServiceImpl implements ExamRecordAlreadyAudit
             return new ArrayList<>();
         }
 
-        query.setSelectType(SelectType.EXPORT);
         query.setPageNo(1);
         query.setPageSize(1000);
 
@@ -313,10 +311,11 @@ public class ExamRecordAlreadyAuditServiceImpl implements ExamRecordAlreadyAudit
         if (!isCount) {
             sql.append(" group by rd.id");
 
-            if (SelectType.EXPORT == query.getSelectType()) {
-                sql.append(" order by rd.id desc");
-            } else {
+            if (query.getUpdateTimeDesc() != null && query.getUpdateTimeDesc()) {
                 sql.append(" order by rd.update_time desc");
+            } else {
+                // 默认排序
+                sql.append(" order by rd.id desc");
             }
         }
 

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

@@ -5,7 +5,6 @@ import cn.com.qmth.examcloud.commons.util.DateUtil;
 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.dao.enums.CourseLevel;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.SelectType;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordIllegallyService;
 import cn.com.qmth.examcloud.core.oe.admin.service.IllegallyTypeService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditEntityConvert;
@@ -80,7 +79,6 @@ public class ExamRecordIllegallyServiceImpl implements ExamRecordIllegallyServic
     public List<ExamAuditExcel> getExamRecordIllegallyListForExport(ExamAuditQuery query, UserDataRule courseRule, UserDataRule orgRule) {
         Check.isNull(query, "请求参数不能为空！");
         Check.isNull(query.getExamId(), "请先选择考试！");
-        query.setSelectType(SelectType.EXPORT);
 
         if (courseRule.assertEmptyQueryResult() || orgRule.assertEmptyQueryResult()) {
             return new ArrayList<>();
@@ -236,10 +234,11 @@ public class ExamRecordIllegallyServiceImpl implements ExamRecordIllegallyServic
         if (!isCount) {
             // sql.append(" group by rd.id");
 
-            if (SelectType.EXPORT == query.getSelectType()) {
-                sql.append(" order by rd.id desc");
-            } else {
+            if (query.getUpdateTimeDesc() != null && query.getUpdateTimeDesc()) {
                 sql.append(" order by rd.update_time desc");
+            } else {
+                // 默认排序
+                sql.append(" order by rd.id desc");
             }
         }
 

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

@@ -6,7 +6,6 @@ import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.DateUtils;
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.CourseLevel;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordWaitingAuditService;
-import cn.com.qmth.examcloud.core.oe.admin.service.IllegallyTypeService;
 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.support.cache.CacheHelper;
@@ -33,9 +32,6 @@ public class ExamRecordWaitingAuditServiceImpl implements ExamRecordWaitingAudit
 
     private static final Logger log = LoggerFactory.getLogger(ExamRecordWaitingAuditServiceImpl.class);
 
-    @Autowired
-    private IllegallyTypeService illegallyTypeService;
-
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
@@ -243,7 +239,13 @@ public class ExamRecordWaitingAuditServiceImpl implements ExamRecordWaitingAudit
 
         if (!isCount) {
             sql.append(" group by rd.id");
-            sql.append(" order by rd.id desc");
+
+            if (query.getUpdateTimeDesc() != null && query.getUpdateTimeDesc()) {
+                sql.append(" order by rd.update_time desc");
+            } else {
+                // 默认排序
+                sql.append(" order by rd.id desc");
+            }
         }
 
         return sql.toString();