From 96fcfee5c4f0632a9f43af11847708abee15c73f Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期二, 31 八月 2021 09:38:52 +0800
Subject: [PATCH] 1.0.5
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 9b4bf8c..f4d2d07 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -58,10 +58,13 @@
public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
+ excludeTrash(param);
ViewStayTimeBean bean = new ViewStayTimeBean();
bean.setPageSize(limit);
bean.setPageNumber(curr);
+ bean.setLoc_no((String) param.get("loc_no"));
List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
+
int count = reportQueryMapper.getViewStayTimeCount(bean);
Page<ViewStayTimeBean> page = new Page<>();
page.setRecords(list);
@@ -151,6 +154,7 @@
@ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
public R viewWorkInExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @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);
@@ -173,6 +177,7 @@
@ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
public R viewWorkOutExport(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @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);
--
Gitblit v1.9.1