From 5e966ab720ffff2bd0fe55ffda7263606923732d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 02 二月 2023 10:58:03 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs

---
 src/main/java/com/zy/asrs/controller/ReportQueryController.java |   15 +++++++++++++++
 1 files changed, 15 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 b25238c..03433fc 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -68,6 +68,21 @@
 		ViewStayTimeBean bean = new ViewStayTimeBean();
 		bean.setPageSize(limit);
 		bean.setPageNumber(curr);
+		String matnr = String.valueOf(param.get("matnr"));
+		if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+			bean.setMatnr(matnr);
+		}
+
+		String maktx = String.valueOf(param.get("maktx"));
+		if (!Cools.isEmpty(maktx) && !maktx.equals("null")) {
+			bean.setMaktx(maktx);
+		}
+
+		String specs = String.valueOf(param.get("specs"));
+		if (!Cools.isEmpty(specs) && !specs.equals("null")) {
+			bean.setSpecs(specs);
+		}
+
 		String locNo = String.valueOf(param.get("loc_no"));
 		if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
 			bean.setLoc_no(locNo);

--
Gitblit v1.9.1