From 7b483fbf115c9ea0a433e7fafed95fdf4bf2415f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 29 七月 2020 13:25:20 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 836f31e..9b4bf8c 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;
@@ -136,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<>();
@@ -155,18 +151,15 @@
@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());
+ 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<>();
@@ -180,7 +173,9 @@
@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());
+ 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