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/webapp/static/js/report/workOut.js                     |    7 ++++++-
 src/main/java/com/zy/asrs/controller/ReportQueryController.java |    4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 2f8f616..9b4bf8c 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -173,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));
 	}
 
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index 035d6b5..b4f4f32 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -90,8 +90,13 @@
                             fields.push(col.field);
                         }
                     });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
                     var param = {
-                        'fields': fields
+                        fields: fields,
+                        exportData: exportData
                     };
                     $.ajax({
                         url: baseUrl+"/report/viewWorkOutExport.action",

--
Gitblit v1.9.1