|
@@ -2,6 +2,7 @@ package cn.com.qmth.scancentral.service.impl;
|
|
|
|
|
|
import java.util.*;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang.math.RandomUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -782,7 +783,13 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
|
|
|
@Override
|
|
|
public IPage<BatchEntity> findUnCheck(Long examId, int pageNumber, int pageSize, BatchStatus batchStatus,
|
|
|
CheckStatus checkStatus, String order) {
|
|
|
- return this.baseMapper.findUnCheck(new Page<>(pageNumber, pageSize), examId, batchStatus, checkStatus, order);
|
|
|
+ Page page = new Page<>(pageNumber, pageSize);
|
|
|
+ if("ASC".equalsIgnoreCase(order)){
|
|
|
+ page.addOrder(OrderItem.asc("id"));
|
|
|
+ }else{
|
|
|
+ page.addOrder(OrderItem.desc("id"));
|
|
|
+ }
|
|
|
+ return this.baseMapper.findUnCheck(page, examId, batchStatus, checkStatus);
|
|
|
}
|
|
|
|
|
|
@Override
|