From dea586adf232c722e8d2dfa833c3d7711a1019df Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 02 二月 2026 13:37:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index db4b088..8d2f9ad 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -42,8 +42,20 @@
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
+ }
+
+ @RequestMapping(value = "/orderDetl/pakout/list/auth")
+ @ManagerAuth
+ public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -63,17 +75,17 @@
@ManagerAuth
public R add(OrderDetl orderDetl) {
orderDetlService.insert(orderDetl);
- return R.ok();
+ return R.ok("response.save_success");
}
- @RequestMapping(value = "/orderDetl/update/auth")
- @ManagerAuth
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
public R update(OrderDetl orderDetl){
if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
- return R.error();
+ return R.error("response.param_error");
}
orderDetlService.updateById(orderDetl);
- return R.ok();
+ return R.ok("response.update_success");
}
@RequestMapping(value = "/orderDetl/delete/auth")
@@ -82,7 +94,7 @@
for (Long id : ids){
orderDetlService.deleteById(id);
}
- return R.ok();
+ return R.ok("response.delete_success");
}
@RequestMapping(value = "/orderDetl/export/auth")
@@ -119,7 +131,7 @@
if (null != orderDetlService.selectOne(wrapper)){
return R.parse(BaseRes.REPEAT).add(getComment(OrderDetl.class, String.valueOf(param.get("key"))));
}
- return R.ok();
+ return R.ok("response.operation_success");
}
}
--
Gitblit v1.9.1