diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
index 3bd0fa6..33f022b 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
@@ -86,36 +86,100 @@
 						<c:forEach items="${varList}" var="var" varStatus="vs">
 							<tr>
 							
-								<td>${vs.index+1}</td>
-								<td>${myelfun:findClassName(var.class_id)}</td>
-								<td >${var.creat_time}</td>
+								<td>
+								  <c:if test="${not empty var.class_id }">
+									${vs.index+1}
+								   </c:if>
+								  <c:if test="${empty var.class_id }">
+								  	/
+								  </c:if>
+								</td>
+								<td>
+								  <c:if test="${not empty var.class_id }">
+									${myelfun:findClassName(var.class_id)}
+								  </c:if>
+								  <c:if test="${empty var.class_id }">
+									年级平均
+								  </c:if>
+								</td>
+								<td >
+								<c:if test="${not empty var.class_id }">
+								  ${var.creat_time}
+								  </c:if>
+								  <c:if test="${empty var.class_id }">
+								  	/
+								  </c:if>
+								  </td>
 								<td >${var.avg_score}</td>
-								<td >${var.student_num}</td>
-								<td >${var.you}</td>
+								<td >
+								  <c:if test="${not empty var.class_id }">
+								    ${var.student_num}
+								  </c:if>
+								  <c:if test="${empty var.class_id }">
+								  	/
+								  </c:if>
+								<td >
+								<c:if test="${not empty var.class_id }">
+								    ${var.you}
+								  </c:if>
+								  <c:if test="${empty var.class_id }">
+								  	/
+								  </c:if>
+								</td>
 								<td >
 									<fmt:formatNumber type="number"
 									value="${var.student_num == 0 ? 0: (var.you / var.student_num * 100)}"
 									maxFractionDigits="2" />%
 								</td>
-								<td >${var.liang}</td>
+								<td >
+								<c:if test="${not empty var.class_id }">
+								    ${var.liang}
+								  </c:if>
+								  <c:if test="${empty var.class_id }">
+								  	/
+								  </c:if>
+								
+								</td>
 								<td >
 									<fmt:formatNumber type="number"
 									value="${var.student_num == 0 ? 0: (var.liang / var.student_num * 100)}"
 									maxFractionDigits="2" />%
 								</td>
-								<td >${var.jige}</td>
+								<td >
+									<c:if test="${not empty var.class_id }">
+								    ${var.jige}
+								  </c:if>
+								  <c:if test="${empty var.class_id }">
+								  	/
+								  </c:if>
+								</td>
 								<td >
 									<fmt:formatNumber type="number"
 									value="${var.student_num == 0 ? 0: (var.jige / var.student_num * 100)}"
 									maxFractionDigits="2" />%
 								</td>
-								<td >${var.difen}</td>
+								<td >
+									<c:if test="${not empty var.class_id }">
+								    ${var.difen}
+								  </c:if>
+								  <c:if test="${empty var.class_id }">
+								  	/
+								  </c:if>
+								</td>
 								<td >
 									<fmt:formatNumber type="number"
 									value="${var.student_num == 0 ? 0: (var.difen / var.student_num * 100)}"
 									maxFractionDigits="2" />%
 								</td>
-								<td ><a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}">查看成绩</a></td>
+								<td >
+								
+								<c:if test="${not empty var.class_id }">
+								<a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}">查看成绩</a>
+								</c:if>
+								  <c:if test="${empty var.class_id }">
+								<a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a>
+								</c:if>
+								</td>
 							</tr>
 						
 						</c:forEach>
diff --git a/resources/mybatis1/sunvote/TestPaperInfoMapper.xml b/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
index f65149d..da6a947 100644
--- a/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
+++ b/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
@@ -230,7 +230,11 @@
 		<include refid="tableName"></include>
 			where 1 =1 
 		<if test="TEST_ID != null and TEST_ID != ''">
-			and TEST_ID = #{TEST_ID}
+			<!--and TEST_ID = #{TEST_ID}-->
+			and TEST_ID in
+		<foreach item="TEST_ID" index="index" collection="TEST_ID" open="(" separator="," close=")">
+                 #{TEST_ID}
+		</foreach>
 		</if>
 		<if test="STUDENT_ID != null and STUDENT_ID != ''">
 			and STUDENT_ID = #{STUDENT_ID}
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index a059df7..b62dc80 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -198,6 +198,7 @@ public class PaperController extends BaseController {
 		PageData pd = new PageData();
 		List<PageData> templist = new ArrayList<PageData>();
 		PageData saveData = new PageData();
+		DecimalFormat decimalFormat=new DecimalFormat("0.00");
 		
 		ResponseGson<PageData> res = new ResponseGson();
 		pd = this.getPageData();
@@ -205,12 +206,21 @@ public class PaperController extends BaseController {
 			List<PageData> list = testpaperService.listAll(pd);
 			
 			pd.put("testpaperlist", list);
+			Integer you_sum = 0;   //优秀总人数
+			Integer liang_sum = 0; //良好总人数
+			Integer jige_sum = 0;  //及格总人数
+			Integer difen_sum = 0; //低分总人数
+			Integer num_sum =0;    //年级总人数
+			Float avg_sum = (float)0;  //平均分的和
+			String testpaperList = "";
+			
 			for(int i = 0 ;i<list.size();i++){
 				PageData data = new PageData();
 				
 				PageData pdtemp = new PageData();
 				pdtemp.put("CLASS_ID", list.get(i).get("SCLASS_ID").toString());
 				List<PageData> studentlist = stundentService.listAllClass(pdtemp);
+				testpaperList+=list.get(i).get("TESTPAPER_ID").toString()+",";
 				data.put("testpaper_id", list.get(i).get("TESTPAPER_ID"));
 				data.put("student_num", studentlist.size());
 				data.put("creat_time", list.get(i).get("CREATE_DATE"));
@@ -240,6 +250,12 @@ public class PaperController extends BaseController {
 					}
 					
 				}
+				you_sum+=you;
+				liang_sum += liang;
+				jige_sum+=jige;
+				difen_sum+=difen;
+				num_sum+=studentlist.size();
+				avg_sum+=Float.valueOf(list.get(i).get("AVG_SCORE").toString());
 				
 				data.put("you",you);
 				data.put("liang",liang);
@@ -248,7 +264,24 @@ public class PaperController extends BaseController {
 				
 				templist.add(data);
 			}
+			if(list.size()>0){
+			PageData dataTemp = new PageData();
+			dataTemp.put("testpaper_id", "");
+			dataTemp.put("student_num", num_sum);
+			dataTemp.put("creat_time", "");
+			dataTemp.put("avg_score", decimalFormat.format(avg_sum/list.size()));
+			dataTemp.put("class_id", "");
+			dataTemp.put("you",you_sum);
+			dataTemp.put("liang",liang_sum);
+			dataTemp.put("jige",jige_sum);
+			dataTemp.put("difen",difen_sum);
+			dataTemp.put("testpaperList", testpaperList);
+			templist.add(dataTemp);
+			}
 		}
+		
+		
+		
 		saveData.put("list", templist);
 		
 		mv.setViewName("sunvote/paper/test_list1");
@@ -265,6 +298,7 @@ public class PaperController extends BaseController {
 		List<PageData> templist = new ArrayList<PageData>();
 		PageData saveData = new PageData();
 		
+		
 		ResponseGson<PageData> res = new ResponseGson();
 		pd = this.getPageData();
 		if(pd.containsKey("PAPER_ID")){
@@ -402,8 +436,11 @@ public class PaperController extends BaseController {
 					option_num = Integer.valueOf(que.get("OPTION_NUM").toString());
 					onum[i]=option_num;
 				}
-				 
-				temp.put("TEST_ID", pd.get("TESTPAPER_ID"));
+				String tpList = pd.get("TESTPAPER_ID").toString();
+				String tpListArray[] = tpList.split(",");
+				
+				temp.put("TEST_ID", tpListArray);
+				
 				List<PageData> queInfo = testpaperinfoService.listTestPaperQuestionIDinfo(temp);
 				int answer[] = new int[option_num+1];
 				int right = 0;
@@ -487,7 +524,10 @@ public class PaperController extends BaseController {
 					onum[i]=option_num;
 				}
 				 
-				temp.put("TEST_ID", pd.get("TESTPAPER_ID"));
+				String tpList = pd.get("TESTPAPER_ID").toString();
+				String tpListArray[] = tpList.split(",");
+				
+				temp.put("TEST_ID", tpListArray);
 				List<PageData> queInfo = testpaperinfoService.listTestPaperQuestionIDinfo(temp);
 				int answer[] = new int[option_num+1];
 				int right = 0;