From 53f095a34dba25e2fe3b33ae16475bd3a4c682fc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 22 一月 2024 12:55:30 +0800
Subject: [PATCH] 火警日志添加
---
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index e404fc4..0426564 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -42,17 +42,21 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+// wrapper.orderBy("id", false);
+ }
return R.ok(trayCodeService.selectPage(new Page<>(curr, limit), wrapper));
}
private void convert(Map<String, Object> map, EntityWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -124,11 +128,18 @@
return R.ok();
}
+ @RequestMapping(value = "/trayCode/latest")
+ @ManagerAuth
+ public R trayCodeLatest() {
+ List<TrayCode> latest = trayCodeService.selectList(new EntityWrapper<TrayCode>().orderBy("id", false));
+ return R.ok().add(latest.isEmpty()?"10000001": Integer.parseInt(latest.get(0).getTrayNo())+1);
+ }
+
@RequestMapping(value = "/trayCode/print/preview")
@ManagerAuth
public R printPreview(@RequestParam String startNo,
- @RequestParam Integer count,
- @RequestParam Integer type) {
+ @RequestParam Integer count,
+ @RequestParam Integer type) {
if (count <= 0) {
return R.error("鏁伴噺蹇呴』澶т簬闆�");
}
@@ -140,7 +151,7 @@
}
@RequestMapping(value = "/trayCode/print/auth")
- @ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�")
+ @ManagerAuth(memo = "pack鐮佹墦鍗�")
public R print(@RequestParam String startNo,
@RequestParam Integer count,
@RequestParam Integer type){
--
Gitblit v1.9.1