update

娄高锋
1 parent d29c6740
Showing 3 changed files with 12 additions and 5 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/resources/static/pages/forms/mould/shifday.xls
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
@@ -87,6 +87,7 @@ public class ExportController {
 	public List<Map<String, Object>> shifdayExport(@RequestParam Map<String, Object> map) {
 		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String, Object> map2 = new HashMap<String, Object>();
 		ReportUtils ee = new ReportUtils();
 		List<Shifday> shifday = formsService.shifday(map);
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
@@ -110,11 +111,15 @@ public class ExportController {
 			m.put("sjbc", l.getSjbc());
 			resList.add(m);
 		}
+		if(resList.size() > 0){
+			map2 = resList.get(resList.size() - 1);
+			resList.remove(map2);
+		}
 		try {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-			ee.excelReplace(listI, new Object[] { map }, path + "mould/shifday.xls",
+			ee.excelReplace(listI, new Object[] { map2 }, path + "mould/shifday.xls",
 					path + "export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -309,9 +309,6 @@
 				layer.msg("请选择时间");
 				return;
 			}
-				if($("#table").height() > $(window).height() - 110){
-				$("#table").height($(window).height()-110);
-			}
 			var reason = $("input[name='reason']");
 			var params = {};
 			if(line == " ")
@@ -348,7 +345,12 @@
 					$('#export').attr('disabled', "true");
 				else
 					$("#export").removeAttr("disabled");
-				
+
+				if($("#forms").height()+70 > $(window).height()-110){
+					$("#table").height($(window).height()-110);
+				} else {
+					$("#table").height($("#forms").height()+70);
+				}
 			});
 		}