From 92d91fe06533e3c1133713673f4a6d22c75042be Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 10 Oct 2016 11:15:55 +0800
Subject: [PATCH] code update

---
 .../com/lyms/platform/common/utils/ExcelUtil.java  | 52 ++++++++++++++--------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
index 470b81a..90eb52d 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
@@ -55,33 +55,49 @@ public class ExcelUtil
                         {
                                 ws.setColumnView(j, 15);
                         }
-                        // 填充数据的内容
-                        Map<String, Object> map;
-                        for (int i = 0, len = data.size(); i < len; i++)
-                        {
-                                map = data.get(i);
-                                Iterator<String> ite = columName.keySet().iterator();
-                                int j = 0;
+                        Iterator<String> ite = columName.keySet().iterator();
+                        int j = 0;
                                 String keyORvalue = "";
                                 String keyName = "";
                                 while (ite.hasNext())
                                 {
                                         keyName = ite.next();
-                                        if (i > 0)
-                                        { // 类容数据
-                                                keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
-                                        }
-                                        else
-                                        {
-                                                // 第一行列名
-                                                keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
+
                                                 keyName = columName.get(keyName);
                                                 ws.addCell(new Label(j, 0, keyName, wcf));
-                                        }
-                                        ws.addCell(new Label(j, 1 + i, keyORvalue));
+
+                                        ws.addCell(new Label(j, 1 + 0, keyORvalue));
                                         j++;
                                 }
-                        }
+
+
+//                        // 填充数据的内容
+//                        Map<String, Object> map;
+//                        for (int i = 0, len = data.size(); i < len; i++)
+//                        {
+//                                map = data.get(i);
+//                                Iterator<String> ite = columName.keySet().iterator();
+//                                int j = 0;
+//                                String keyORvalue = "";
+//                                String keyName = "";
+//                                while (ite.hasNext())
+//                                {
+//                                        keyName = ite.next();
+//                                        if (i > 0)
+//                                        { // 类容数据
+//                                                keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
+//                                        }
+//                                        else
+//                                        {
+//                                                // 第一行列名
+//                                                keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
+//                                                keyName = columName.get(keyName);
+//                                                ws.addCell(new Label(j, 0, keyName, wcf));
+//                                        }
+//                                        ws.addCell(new Label(j, 1 + i, keyORvalue));
+//                                        j++;
+//                                }
+//                        }
                         
                         wwb.write();
                         wwb.close();
-- 
1.8.3.1