Merge branch '标准版' of http://120.78.57.84/Elvis/SunvoteEducation into 标准版

孙向锦
2 parents 931af053 44243c35
Showing 3 changed files with 7 additions and 2 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
src/com/fh/controller/sunvote/paper/PaperController.java
@@ -57,6 +57,7 @@
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
+				<col style="width: 10%" />
 				<col style="width: 17%" />
 				<thead>
 					<tr>
@@ -66,6 +67,7 @@
 						<th>建议考试时长</th>
 						<th>考试次数</th>
 						<th>总分</th>
+						<th>试卷类型</th>
 						<th>操作</th>
 					</tr>
 				</thead>
@@ -81,6 +83,7 @@
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
+				<col style="width: 10%" />
 				<col style="width: 17%" />
 				<tbody>
 				<c:choose>
@@ -93,6 +96,7 @@
 								<td >${var.EXAM_TIME}</td>
 								<td >${var.TEST_NUM}</td>
 								<td >${var.SCORE}</td>
+								<td >${var.PAPER_TYPE ==1?"个人卷":"年级卷"}</td>
 								<td>
 								<c:if test="${var.PAPER_TYPE ==1 }">
 									<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a>
@@ -285,7 +285,7 @@
 				//}
 			});
-			var defaultUrl = '${pd.DEFAULTURL}?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}';
+			var defaultUrl = '${pd.DEFAULTURL}?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}&SUBJECT_ID=${pd.TEACHER.SUBJECT_ID}';
 			if (defaultUrl != '' && defaultUrl != '') {
 				$("#mainFrame").attr('src', defaultUrl);
 			}
@@ -755,7 +755,7 @@ public class PaperController extends BaseController {
 			Integer test_num = 0;
 			Integer lost_num = 0;
 			List<String> classId = new ArrayList();
-			PageData sclass = new PageData();
+			
 			for (PageData item : list) {
 				PageData p = new PageData();
@@ -803,6 +803,7 @@ public class PaperController extends BaseController {
 						stu.put("CLASS_NAME", item.get("CLASS_NAME"));
 						if(!classId.contains(item.getString("CLASS_ID"))){
 							classId.add(item.getString("CLASS_ID"));
+							PageData sclass = new PageData();
 							sclass.put("CLASS_ID", item.get("CLASS_ID"));
 							sclass.put("CLASS_NAME", item.get("CLASS_NAME"));
 							sclass_list.add(sclass);