From 6e65e575aedd776432cda5a88f7434320f42e3f4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 22 五月 2023 16:58:19 +0800
Subject: [PATCH] fixed
---
src/main/java/com/zy/asrs/controller/CommandInfoController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CommandInfoController.java b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
index 9101e77..5bd8726 100644
--- a/src/main/java/com/zy/asrs/controller/CommandInfoController.java
+++ b/src/main/java/com/zy/asrs/controller/CommandInfoController.java
@@ -40,6 +40,22 @@
EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ wrapper.in("command_status", "1,2");
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/commandInfo/listLog/auth")
+ @ManagerAuth
+ public R listLog(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ wrapper.in("command_status", "3");
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1