wrkDetl

Junjie

2023-05-24 99f220b7ee2b021418321071307c6b3d33ca59b8

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

@@ -40,6 +40,22 @@
        EntityWrapper<CommandInfo> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        wrapper.in("command_status", "1,2");
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/commandInfo/listLog/auth")
    @ManagerAuth
    public R listLog(@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<CommandInfo> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        wrapper.in("command_status", "3");
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(commandInfoService.selectPage(new Page<>(curr, limit), wrapper));
    }