123

zhang

3 天以前 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85

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

@@ -54,6 +54,8 @@
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private OrderLogService orderLogService;
    @Autowired
    private MatService matService;

    @RequestMapping(value = "/order/nav/list/auth")
@@ -338,6 +340,24 @@
        return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/list/log/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<OrderLog> 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(orderLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    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());