#

luxiaotao1123

2020-06-22 d79692c7b03e3b96016598ac03766c29ca094709

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

@@ -35,7 +35,7 @@
    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        return R.ok(locDetlService.getStockOut(new Page<LocDetl>(curr, limit).setCondition(param)));
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
    }

    @RequestMapping(value = "/locDetl/list/auth")
@@ -44,10 +44,12 @@
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }