From 7a27f5e7896cace9e519f6343c76e91d5c43800a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 06 十一月 2025 09:28:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java | 6 +++++-
src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java | 20 +++++++++++++-------
src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java | 6 +++++-
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
4 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
index 3aae3a3..53eb61e 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorLogController.java
@@ -42,7 +42,11 @@
excludeTrash(param);
convert(param, wrapper);
allLike(BasCrnErrorLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderBy("create_time", false);
+ } else {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basCrnErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
index 11a8ec2..816dbf0 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpErrorLogController.java
@@ -42,7 +42,11 @@
excludeTrash(param);
convert(param, wrapper);
allLike(BasDevpErrorLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderBy("create_time", false);
+ } else {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basDevpErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java b/src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java
index 88cf866..2b12861 100644
--- a/src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasRgvErrorLogController.java
@@ -32,17 +32,23 @@
@RequestMapping(value = "/basRgvErrorLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasRgvErrorLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasRgvErrorLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+
+ if (Cools.isEmpty(orderByField)) {
+ wrapper.orderBy("create_time", false);
+ } else {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+
return R.ok(basRgvErrorLogService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index be5ae53..23fd172 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -72,7 +72,7 @@
or (wrk_sts=15 and take_none = '1' and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp) and wrk_no not in (select wrk_no from asr_wrk_mast_sta))
or (wrk_sts=15 and dateadd(mi,3,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_no in (9997,9996) and wrk_sts = 5)
+ or (wrk_no in (9997,9996) and wrk_sts = 15)
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1