yin 8 сар өмнө
parent
commit
21d5eb1a9c

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/dao/BatchDao.java

@@ -43,7 +43,7 @@ public interface BatchDao extends BaseMapper<BatchEntity> {
             @Param(value = "endTime") Long endTime);
 
     IPage<BatchEntity> findUnCheck(Page<BatchEntity> page, @Param("examId") Long examId,
-            @Param("batchStatus") BatchStatus batchStatus, @Param("checkStatus") CheckStatus checkStatus,@Param("checkOrder")String checkOrder);
+            @Param("batchStatus") BatchStatus batchStatus, @Param("checkStatus") CheckStatus checkStatus);
 
     List<BatchDetailDO> batchDetailListToCheck(@Param("id") Long id, @Param("needCheck") Boolean needCheck);
 

+ 8 - 1
src/main/java/cn/com/qmth/scancentral/service/impl/BatchServiceImpl.java

@@ -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

+ 0 - 1
src/main/resources/mapper/BatchMapper.xml

@@ -203,7 +203,6 @@
         where b.exam_id = #{examId}
         and b.status = #{batchStatus}
         and b.check_status = #{checkStatus}
-        order by b.id  #{checkOrder}
     </select>
 
     <select id="getHistory"