From 8d78203c9a377d299a0af64efc535a86b5d98c39 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 25 七月 2020 09:44:54 +0800 Subject: [PATCH] #当前本版十分完美、冻结 --- src/main/java/com/zy/asrs/controller/ReportQueryController.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java index fc5f5ab..836f31e 100644 --- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java +++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java @@ -45,7 +45,7 @@ // 瀵煎嚭 @RequestMapping(value = "/viewStockUseExport.action") - @ManagerAuth + @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭") public R viewStockUseExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean()); @@ -53,7 +53,6 @@ } //------------------搴撳瓨婊炵暀缁熻-------------------------------------- - @ResponseBody @RequestMapping("/viewStayTimeList.action") public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @@ -71,7 +70,7 @@ // 瀵煎嚭 @RequestMapping(value = "/viewStayTimeExport.action") - @ManagerAuth + @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭") public R viewStayTimeExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean()); @@ -79,6 +78,11 @@ } //-----------------搴撳瓨MAP鍥�-------------------------------------- + @RequestMapping("/viewLocMapList/rows.action") + public R queryViewLocMapRows(){ + return R.ok().add(reportQueryMapper.getViewLocRowTotal()); + } + @RequestMapping("/viewLocMapList.action") public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1")Integer row){ // 鑾峰彇鎺掔骇鏁版嵁 @@ -123,7 +127,7 @@ //excel瀵煎嚭 @RequestMapping("/viewInOutExport.action") - @ManagerAuth + @ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭") public R viewInOutExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean()); @@ -148,7 +152,7 @@ //excel瀵煎嚭 @RequestMapping("/viewWorkInExport.action") - @ManagerAuth + @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�") public R viewWorkInExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(new ViewWorkInBean()); @@ -173,7 +177,7 @@ //excel瀵煎嚭 @RequestMapping("/viewWorkOutExport.action") - @ManagerAuth + @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�") public R viewWorkOutExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(new ViewWorkInBean()); -- Gitblit v1.9.1