|
@@ -1025,7 +1025,8 @@ public class ApmacController extends SimpleController {
|
|
|
String fileName = "report" + df2.format(new Date());
|
|
|
response.setHeader("Content-Disposition", "attachment;filename="+ fileName + ".xls");
|
|
|
// 需要对excel的列的总数进行指定
|
|
|
- int column = 4;
|
|
|
+ //为了使office的excel也能打开导出的表格,在导出模板中MergeAcross>实际导出的列,且column>MergeAcross
|
|
|
+ int column = 6;
|
|
|
map.put("dataSize", (wifiSumList.size() + 100));
|
|
|
map.put("column", column);
|
|
|
|