四期

zhangc

2025-03-09 dfc9552392f9f973ab52e55d58a7ae2acdaeb1f3

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

@@ -54,6 +54,31 @@
        }else {
            wrapper.orderBy("io_time", false);
        }
        Page<AgvWrkMast> agvWrkMastPage = agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(agvWrkMastPage);
    }

    @RequestMapping(value = "/wrkMast/list/auth/dbList")
    @ManagerAuth
    public R dbList(@RequestParam(defaultValue = "1")Integer curr,
                  @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<AgvWrkMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){
            if (orderByField.endsWith("$")){
                orderByField = orderByField.substring(0, orderByField.length()-1);
            }
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }else {
            wrapper.orderBy("io_time", false);
        }
        wrapper.in("io_type",108,111,112);
        return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -86,7 +111,7 @@
    public R delete(@RequestParam String param){
        List<AgvWrkMast> list = JSONArray.parseArray(param, AgvWrkMast.class);
        if (Cools.isEmpty(list)){
            return R.error();
            return R.error("工作档参数缺失");
        }
        for (AgvWrkMast entity : list){
            agvWrkMastService.delete(new EntityWrapper<>(entity));