#getter$摘出entity

zhou zhou

1 天以前 1dcfa3702505f0c431757312b5304531029f90f6

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java

@@ -51,26 +51,25 @@
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Delivery, BaseParam> pageParam = new PageParam<>(baseParam, Delivery.class);
        PageParam<Delivery, BaseParam> page = deliveryService.page(pageParam, pageParam.buildWrapper(true));
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
        return R.ok().add(buildPageRowsUtils.rowsMap(page));
    }

    @PreAuthorize("hasAuthority('manager:delivery:list')")
    @PostMapping("/delivery/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(deliveryService.list());
        return R.ok().add(buildPageRowsUtils.rowsMap(deliveryService.list()));
    }

    @PreAuthorize("hasAuthority('manager:delivery:list')")
    @PostMapping({"/delivery/many/{ids}", "/deliverys/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(deliveryService.listByIds(Arrays.asList(ids)));
        return R.ok().add(buildPageRowsUtils.rowsMap(deliveryService.listByIds(Arrays.asList(ids))));
    }

    @PreAuthorize("hasAuthority('manager:delivery:list')")
    @GetMapping("/delivery/{id}")
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(deliveryService.getById(id));
        return R.ok().add(buildPageRowsUtils.rowsMap(deliveryService.getById(id)));
    }

    @PreAuthorize("hasAuthority('manager:delivery:save')")
@@ -89,7 +88,7 @@
        if (!deliveryService.save(delivery)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(delivery);
        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(delivery));
    }

    @PreAuthorize("hasAuthority('manager:delivery:update')")
@@ -108,7 +107,7 @@
        if (!deliveryService.updateById(delivery)) {
            return R.error("Update Fail");
        }
        return R.ok("Update Success").add(delivery);
        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(delivery));
    }

    @PreAuthorize("hasAuthority('manager:delivery:remove')")
@@ -119,7 +118,7 @@
        if (list.isEmpty()) {
            return R.error("参数不能为空！！");
        }
        return R.ok("操作成功").add(deliveryService.removeDo(list));
        return R.ok("操作成功").add(buildPageRowsUtils.rowsMap(deliveryService.removeDo(list)));
    }

    @PreAuthorize("hasAuthority('manager:delivery:list')")
@@ -133,7 +132,7 @@
        deliveryService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                item -> vos.add(new KeyValVo(item.getId(), item.getId()))
        );
        return R.ok().add(vos);
        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
    }

    @PreAuthorize("hasAuthority('manager:delivery:list')")
@@ -175,7 +174,7 @@
                orderTemplates.add(template);
            }
        }
        ExcelUtil.build(ExcelUtil.create(orderTemplates, DeliveryTemplate.class), response);
        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(orderTemplates), DeliveryTemplate.class), response);
    }

    @PostMapping("/delivery/import")
@@ -186,7 +185,7 @@
            return R.error("文件不能为空！！");
        }
        Map<String, Object> hashMap = new HashMap<>();
        return R.ok("导入成功").add(deliveryItemService.excelImport(file, hashMap, getLoginUserId()));
        return R.ok("导入成功").add(buildPageRowsUtils.rowsMap(deliveryItemService.excelImport(file, hashMap, getLoginUserId())));

    }