From 6ec763ab7467fc01783336e13613a516423578e7 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 02 七月 2020 17:14:32 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/TrayCodeController.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java index 41da46b..671ba6b 100644 --- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java +++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java @@ -12,7 +12,6 @@ import com.core.common.R; import com.core.exception.CoolException; import com.zy.asrs.entity.TrayCode; -import com.zy.asrs.entity.param.TrayCodeParam; import com.zy.asrs.service.TrayCodeService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +32,7 @@ } @RequestMapping(value = "/trayCode/list/auth") - @ManagerAuth +// @ManagerAuth public R list(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam(required = false)String orderByField, @@ -126,20 +125,22 @@ } @PostMapping(value = "/trayCode/print/preview") - @ManagerAuth - public R printPreview(@RequestParam TrayCodeParam param) { - if (param.getCount() <= 0) { +// @ManagerAuth + public R printPreview(@RequestParam String startNo, + @RequestParam Integer count, + @RequestParam Integer type) { + if (count <= 0) { return R.error("鏁伴噺蹇呴』澶т簬闆�"); } List<Map<String, Object>> res = new ArrayList<>(); - for (int i = 0; i<param.getCount(); i++) { - res.add(Cools.add("item", String.valueOf(Integer.parseInt(param.getStartNo())+i))); + for (int i = 0; i<count; i++) { + res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo)+i))); } return R.ok().add(res); } @RequestMapping(value = "/trayCode/print/auth") - @ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�") +// @ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�") public R print(@RequestParam String startNo, @RequestParam Integer count, @RequestParam Integer type){ -- Gitblit v1.9.1