From b6b46e1c4d390c80cf9bd7d4daa23202f2d11a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 13:47:57 +0800
Subject: [PATCH] 站点管理编辑高低库位
---
src/main/java/com/zy/asrs/controller/BasSteErrLogController.java | 14 +++++++++-----
1 files changed, 9 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 a0a8bf6..eba925b 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
@@ -1,17 +1,16 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasSteErrLog;
-import com.zy.asrs.service.BasSteErrLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasSteErrLog;
+import com.zy.asrs.service.BasSteErrLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,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