update.

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

@@ -54,6 +54,7 @@ public class ExamRecordIllegallyServiceImpl implements ExamRecordIllegallyServic
         String countSql = this.queryExamRecordIllegallyListSql(query, true, courseRule, orgRule);
         String querySql = this.queryExamRecordIllegallyListSql(query, false, courseRule, orgRule);
         String pageSql = querySql + " limit " + offset + "," + query.getPageSize();
+        log.debug(pageSql);
 
         if (SelectType.EXPORT == query.getSelectType()) {
             // 仅导出结果
@@ -200,7 +201,9 @@ public class ExamRecordIllegallyServiceImpl implements ExamRecordIllegallyServic
         }
 
         if (!isCount) {
-            sql.append(" order by rd.update_time desc");
+            // sql.append(" group by rd.id");
+            // sql.append(" order by rd.update_time desc");
+            sql.append(" order by rd.id desc");
         }
 
         return sql.toString();

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

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 import cn.com.qmth.examcloud.api.commons.security.bean.UserDataRule;
 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.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;
@@ -52,6 +53,7 @@ public class ExamRecordWaitingAuditServiceImpl implements ExamRecordWaitingAudit
         String countSql = this.queryExamRecordWaitingAuditListSql(query, true, courseRule, orgRule);
         String querySql = this.queryExamRecordWaitingAuditListSql(query, false, courseRule, orgRule);
         String pageSql = querySql + " limit " + offset + "," + query.getPageSize();
+        log.debug(pageSql);
 
         Long totalElements = jdbcTemplate.queryForObject(countSql, Long.class);
         if (totalElements == null || totalElements == 0) {
@@ -99,6 +101,16 @@ public class ExamRecordWaitingAuditServiceImpl implements ExamRecordWaitingAudit
 
             info.setDataId(info.getId());
             info.setHasVirtual(StringUtils.isNotBlank(info.getVirtualCameraNames()));
+            if (info.getStartTime() != null) {
+                info.setPaperStartTime(DateUtils.format(info.getStartTime()));
+            } else {
+                info.setPaperStartTime("");
+            }
+            if (info.getEndTime() != null) {
+                info.setPaperSubmitTime(DateUtils.format(info.getEndTime()));
+            } else {
+                info.setPaperSubmitTime("");
+            }
         }
     }