Index: ssts-web/src/main/webapp/common/commonImport.jsp
===================================================================
diff -u -r12335 -r26116
--- ssts-web/src/main/webapp/common/commonImport.jsp	(.../commonImport.jsp)	(revision 12335)
+++ ssts-web/src/main/webapp/common/commonImport.jsp	(.../commonImport.jsp)	(revision 26116)
@@ -17,6 +17,37 @@
 <script type="text/javascript" src="${ctx }/scripts/tabview.js"></script>
 <script type="text/JavaScript" src="${ctx }/scripts/swapimgage.js"></script>
 <script type="text/javascript">
+<%
+    String redirectTo = (String)request.getAttribute(com.forgon.tools.AppKeys.RedirectTo);
+	String[][] msg = (String[][])request.getAttribute("msg");	
+	if(msg != null){
+		 for(int i = 0;i<msg.length;i++){
+			if(msg[i][3] != null && !msg[i][3].isEmpty()){
+	 			/*3,4,9|9,4,9这是原来的格式*/
+	 			String[] messages = msg[i][3].split("\\|");
+	 			StringBuffer sb = new StringBuffer();
+	 			for(int j=0 ; j<messages.length;j++ ){
+	 				String[] lineAndRowAndErrorNumber = messages[j].split(",");
+	 				if(lineAndRowAndErrorNumber.length == 3){
+	 					try{
+	 						int errorNumber = Integer.parseInt(lineAndRowAndErrorNumber[2]);
+		 					sb.append("第"+lineAndRowAndErrorNumber[0]+"行  第" +
+		 		 						lineAndRowAndErrorNumber[1]+"列  错误信息:" +
+		 								Constants.ErrorStrings[errorNumber-1]+"<br>");
+	 					}catch(Exception e){
+		 					sb.append(messages[j]+"<br>");
+	 					}
+	 				}else{
+	 					sb.append(messages[j]+"<br>");
+	 				}
+	 		 	}
+	 			msg[i][3] = sb.toString();	 		
+			}
+		}
+		 request.setAttribute("msg", msg); 	
+		 request.setAttribute("redirectTo", redirectTo); 	
+	}
+%>
 YAHOO.example.init = function() {
     var tabView = new YAHOO.widget.TabView();
     
@@ -114,7 +145,7 @@
           <a href="#" onclick="importData();return false;"><img class="accessories_iamge" src="${ctx }/images/btn_save.gif">导入文件</a>
         </li>
         <li>
-          <a href="#" onclick="history.go(-1);return false;"><img class="accessories_iamge" src="${ctx }/images/btn_delete.gif">取消</a>
+          <a href="#" onclick="history.go('${ctx }${redirectTo}');return false;"><img class="accessories_iamge" src="${ctx }/images/btn_delete.gif">取消</a>
         </li>
         <li>
           <a href="${ctx }${formatFile}" target="_blank" id="viewFileFormat"><img class="accessories_iamge" src="${ctx }/images/search.gif">查看文件格式</a>
@@ -138,6 +169,28 @@
             </td>
         </tr>
     </table>
+    <br>
+    <table width="730" border="1" align="center" cellpadding="0"
+		cellspacing="0" class="table_no_bg">
+		<tr height="30">
+			<td width="120" class="form_label" style="text-align: center">模块名称</td>
+			<td width="120" class="form_label" style="text-align: center">成功插入/更新数量</td>
+			<td width="120" class="form_label" style="text-align: center">失败数量</td>
+			<td width="700" class="form_label" style="text-align: center">错误信息</td>
+		</tr>
+		<c:forEach items="${msg}" var="msgArr">
+			<tr height="30">
+				<td width="120" class="table_td_text" style="word-break: break-all;"
+					style="text-align: center;">${msgArr[0]}</td>
+				<td width="120" class="table_td_text" style="word-break: break-all;"
+					style="text-align: center;">${msgArr[1]}</td>
+				<td width="120" class="table_td_text" style="word-break: break-all;"
+					style="text-align: center;">${msgArr[2]}</td>
+				<td width="700" class="table_td_text" style="word-break: break-all;text-align:left;padding-left:20px;"
+					style="text-align: center;"><c:if test="${empty msgArr[3]}">&nbsp;</c:if>${msgArr[3]}</td>
+			</tr>
+		</c:forEach>
+	</table>
     </div>
     </div>
     </div>