*

lsh

12 小时以前 054b36d1437864e90d69d99c698a6fa7e9421165

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

@@ -135,14 +135,23 @@
        return R.ok();
    }

    @RequestMapping(value = "/cargo/grouping/auth")
    @RequestMapping(value = "/orderDetl/cargo/grouping/auth")
    @ManagerAuth
    public R orderDetlCargoGrouping(@RequestBody JSONObject param) {
        Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != orderDetlService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
    public R orderDetlCargoGrouping(@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);
        }
        return R.ok();
        wrapper.eq("status", 1);
        Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderDetlPage);
    }


}