From 0f478c31b5327ffe4bfdebd72fdf23a6df5d37e6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 02 六月 2023 11:55:11 +0800
Subject: [PATCH] 随机获取可用且有空库位的堆垛机号，找新巷道时增加判断
---
src/main/java/com/zy/asrs/controller/BasSteErrLogController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
index 3bc7482..eba925b 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
@@ -15,10 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class BasSteErrLogController extends BaseController {
@@ -41,10 +38,15 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<BasSteErrLog> wrapper = new EntityWrapper<>();
+ wrapper.orderBy("start_time",false);
excludeTrash(param);
convert(param, wrapper);
allLike(BasSteErrLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("update_time",false);
+ }
return R.ok(basSteErrLogService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1