From aa92069db113f358747c8dc950e1bb0c9520587a Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Mon, 19 Dec 2016 10:18:06 +0800
Subject: [PATCH] =?UTF-8?q?excel=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PreDataInfoServiceImpl.java       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/com/platform/service/impl/PreDataInfoServiceImpl.java b/src/com/platform/service/impl/PreDataInfoServiceImpl.java
index b1f4c5e7..bb279a1f 100644
--- a/src/com/platform/service/impl/PreDataInfoServiceImpl.java
+++ b/src/com/platform/service/impl/PreDataInfoServiceImpl.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -67,8 +68,8 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 	}
 
 	@Override
-	public Map<String, List> importExcel(List<String> paths) throws Exception {
-		Map<String, List> errmap = new HashMap<String, List>();
+	public Map<String, Object> importExcel(List<String> paths) throws Exception {
+		Map<String, Object> errmap = new HashMap<String, Object>();
 		List<String> errArea = new ArrayList<String>();
 		List<String> errFile = new ArrayList<String>();
 		ArrayList<String> rowErr = new ArrayList<String>();
@@ -156,7 +157,7 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 		}
 		if (errFile.size() > 0) {
 			if (errmap.containsKey("err")) {
-				errFile.addAll(errmap.get("err"));
+				errFile.addAll((Collection<? extends String>) errmap.get("err"));
 			}
 			errmap.put("err",errFile);
 		}
@@ -189,7 +190,12 @@ public class PreDataInfoServiceImpl implements IPreDataInfoService {
 				}
 			}
 		}
-		//TODO 查 地区 是否没有-（没有则添加新地区）：
+		// 记录 操作了 多少条记录
+		errmap.put("system", list4AddSystem.size());
+		errmap.put("area", list4AddArea.size());
+		errmap.put("update", list4Update.size());
+		
+		// 查 地区 是否没有-（没有则添加新地区）：
 		if (list4AddArea.size() > 0) {
 			this.addArea(list4AddArea);
 		}