From b9d80dfdb1cef36c9edb8bf6b2fdf9e6e1708d2b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 26 五月 2025 16:18:24 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
index b0e739e..54d9ef5 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
@@ -35,15 +35,37 @@
@RequestMapping(value = "/orderDetl/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 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 Map<String, Object> param) {
EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ wrapper.eq("status", 1);
+ Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
+ }
+
+ @RequestMapping(value = "/orderDetl/pda/list/auth")
+ @ManagerAuth
+ public R listpda(@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<OrderDetlPakout> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -53,16 +75,16 @@
@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){
+ 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, OrderDetlPakout.class)));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ 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]));
@@ -79,10 +101,10 @@
return R.ok();
}
- @RequestMapping(value = "/orderDetl/update/auth")
- @ManagerAuth
- public R update(OrderDetlPakout orderDetl){
- if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
+ public R update(OrderDetlPakout orderDetl) {
+ if (Cools.isEmpty(orderDetl) || null == orderDetl.getId()) {
return R.error();
}
orderDetlService.updateById(orderDetl);
@@ -91,8 +113,8 @@
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderDetlService.deleteById(id);
}
return R.ok();
@@ -100,7 +122,7 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
@@ -116,7 +138,7 @@
wrapper.like("id", condition);
Page<OrderDetlPakout> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetlPakout orderDetl : page.getRecords()){
+ for (OrderDetlPakout orderDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", orderDetl.getId());
map.put("value", orderDetl.getId());
@@ -129,7 +151,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderDetlService.selectOne(wrapper)){
+ if (null != orderDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1