*

lsh

1 天以前 d7c772dbb13d8ca09c3c4b58264eaca4293094b3

 src/main/java/com/zy/asrs/controller/OrderPakoutController.java

@@ -295,4 +295,22 @@
        return R.ok();
    }

    @RequestMapping(value = "/order/cargo/grouping/auth/v1")
    @ManagerAuth
    public R orderCargoGrouping(@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<OrderPakout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("settle").orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
    }


}