From 9dec8b50fffeb8c1d77a83a6fecd37cc3ec3860f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 29 七月 2020 11:06:52 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index d77ba97..4ed072d 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -78,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){
// 鑾峰彇鎺掔骇鏁版嵁
@@ -131,12 +136,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<>();
@@ -156,12 +156,7 @@
//------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
@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<>();
--
Gitblit v1.9.1