#

luxiaotao1123

2021-03-25 af73582c1bd3c20e2e805d4df56c111073d3fd6f

 src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java

@@ -27,6 +27,17 @@
    @Autowired
    private LocDetlService locDetlService;

    @RequestMapping(value = "/locDetl/queryDetl/auth")
    @ManagerAuth
    public R queryDetl(@RequestParam(required = false) String uuid) {
        if (Cools.isEmpty(uuid)) {
            return R.ok();
        }
        List<LocDetl> locDetls = locDetlService.findByNodeUuid(uuid);
        return R.ok().add(locDetls);
    }


    @RequestMapping(value = "/locDetl/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
@@ -40,11 +51,21 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
        Object nodeId = param.get("node_id");
        if (Cools.isEmpty(nodeId)) {
            nodeId = getOriginNode().getId();
            param.put("node_id", String.valueOf(nodeId));
        }
        if (!Cools.isEmpty(param.get("update_time"))){
            String val = String.valueOf(param.get("update_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                param.put("startTime", DateUtils.convert(dates[0]));
                param.put("endTime", DateUtils.convert(dates[1]));
                param.remove("update_time");
            }
        }
        return R.ok(locDetlService.getPage(toPage(curr, limit, param, LocDetl.class)));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){