From cbe346528fea2fea06b92b354ec5a71717544c12 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 20:18:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 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..ef24c44 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.web.BaseController;
@@ -45,7 +46,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 +54,6 @@
}
//------------------搴撳瓨婊炵暀缁熻--------------------------------------
- @ResponseBody
@RequestMapping("/viewStayTimeList.action")
public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -71,7 +71,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 +79,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 +128,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());
@@ -132,12 +137,7 @@
//------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
@RequestMapping("/viewWorkInList.action")
- public Map<String,Object> viewWorkInList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewWorkInBean bean = new ViewWorkInBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
+ public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
int count = reportQueryMapper.getViewWorkInCount(bean);
Page<ViewWorkInBean> page = new Page<>();
@@ -148,21 +148,19 @@
//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());
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
return R.ok(exportSupport(list, fields));
}
//------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
@RequestMapping("/viewWorkOutList.action")
- public R viewWorkOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewWorkInBean bean = new ViewWorkInBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
+ public R viewWorkOutList(ViewWorkInBean bean){
List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
int count = reportQueryMapper.getViewWorkOutCount(bean);
Page<ViewWorkInBean> page = new Page<>();
@@ -173,10 +171,13 @@
//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());
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
return R.ok(exportSupport(list, fields));
}
--
Gitblit v1.9.1