Browse Source

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

administrator 11 years ago
parent
commit
b3c1964f57

+ 3 - 1
src/main/java/com/uas/platform/b2b/erp/controller/ErpLogController.java

@@ -12,6 +12,7 @@ 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.SystemSession;
@@ -61,7 +62,8 @@ public class ErpLogController {
 		long t1 = System.currentTimeMillis();
 		map.put("data", erpLogService.findAllByPageInfo(pageInfo).getContent());
 		System.out.println(System.currentTimeMillis() - t1);
-		return new ModelAndView(new XmlExcelView("classpath:jxls-tpl/ErpLog", "数据传输日志"), map);
+		return new ModelAndView(new XmlExcelView("classpath:xml-tpl/account/log/ErpLog", "数据传输日志", ContextUtils.getApplicationContext()),
+				map);
 	}
 
 }

+ 1 - 21
src/main/resources/xml-tpl/account/log/ErpLog.xml

@@ -122,27 +122,7 @@
 					<Data ss:Type="String">数据包</Data>
 				</Cell>
 			</Row>
-			<!-- grid row -->
-			<Row>
-				<Cell>
-					<Data ss:Type="String">${item.timeString}</Data>
-				</Cell>
-				<Cell>
-					<Data ss:Type="String">${item.ip}</Data>
-				</Cell>
-				<Cell>
-					<Data ss:Type="String">${item.user.userName}</Data>
-				</Cell>
-				<Cell>
-					<Data ss:Type="String">${item.title}</Data>
-				</Cell>
-				<Cell>
-					<Data ss:Type="String">${item.message}</Data>
-				</Cell>
-				<Cell>
-					<Data ss:Type="String">${item.total}</Data>
-				</Cell>
-			</Row>
+			<!-- grid row repeat -->
 		</Table>
 		<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
 			<PageSetup>