From b196900d48deefb0129e28df0a842fadc3d6bff1 Mon Sep 17 00:00:00 2001 From: zc <zc> Date: 星期二, 03 九月 2024 12:54:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs --- src/main/java/com/zy/asrs/controller/ReportQueryController.java | 6 ++++++ 1 files changed, 6 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 cd42ffc..a3bccc2 100644 --- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java +++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java @@ -128,6 +128,12 @@ ViewInOutBean bean = new ViewInOutBean(); bean.setPageSize(limit); bean.setPageNumber(curr); + if (!Cools.isEmpty(param.get("query_date"))) { + String queryDate = (String) param.get("query_date"); + String[] split = queryDate.split(" - "); + bean.setBegin_date(split[0]); + bean.setEnd_date(split[1]); + } List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean); int count = reportQueryMapper.getViewInOutCount(bean); Page<ViewInOutBean> page = new Page<>(); -- Gitblit v1.9.1