git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@732 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/erp/controller/ErpLogController.java

@@ -1,20 +1,23 @@
 package com.uas.platform.b2b.erp.controller;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.erp.model.ErpLog;
 import com.uas.platform.b2b.erp.service.ErpLogService;
+import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
-import com.uas.platform.core.web.view.XmlGridExcelView;
 
 /**
  * ERP数据传输日志
@@ -51,16 +54,12 @@ public class ErpLogController {
 	 */
 	@RequestMapping(value = "/xls", method = RequestMethod.GET)
 	public ModelAndView exportErpLogs() {
-		return new ModelAndView(new XmlGridExcelView("classpath:xml-tpl/account/log/ErpLog", "数据传输日志",
-				erpLogService.findAll(), ContextUtils.getApplicationContext()));
-//		final PageInfo pageInfo = new PageInfo(1, 50000, 0);
-//		pageInfo.sorting("time", Direction.DESC);
-//		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-//		Map<String, Object> map = new HashMap<String, Object>();
-//		long t1 = System.currentTimeMillis();
-//		map.put("data", erpLogService.findAllByPageInfo(pageInfo).getContent());
-//		System.out.println(System.currentTimeMillis() - t1);
-//		return new ModelAndView(new JxlsExcelView("classpath:jxls-tpl/account/log/ErpLog$List", "数据传输日志"), map);
+		final PageInfo pageInfo = new PageInfo(1, 50000, 0);
+		pageInfo.sorting("time", Direction.DESC);
+		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("data", erpLogService.findAllByPageInfo(pageInfo).getContent());
+		return new ModelAndView(new JxlsExcelView("classpath:jxls-tpl/account/log/ErpLog$List", "数据传输日志"), map);
 	}
 
 }