From dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 23 十二月 2024 15:45:11 +0800
Subject: [PATCH] Merge branch 'phyzasrs-erp' into phyzasrs-erp-4
---
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 20 ++++++++++++++++++++
1 files changed, 20 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 9e69514..35099de 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -89,6 +89,26 @@
if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
bean.setLoc_no(locNo);
}
+ String lev1 = String.valueOf(param.get("lev1"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setLev1(Integer.parseInt(lev1));
+ }
+ String floor = String.valueOf(param.get("floor"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setFloor(Integer.parseInt(floor));
+ }
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setMatnr(matnr);
+ }
+ String maktx = String.valueOf(param.get("maktx"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setMaktx(maktx);
+ }
+ String locType1 = String.valueOf(param.get("locType1"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setMaktx(locType1);
+ }
// List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
// int count = reportQueryMapper.getViewStayTimeCount(bean);
List<ViewStayTimeBean> list = reportQueryMapper.queryAllViewStayTimeList(bean);
--
Gitblit v1.9.1