1.增加老师端可以看到年级卷

2.考试情况中显示出班级所有学生 3.年级分析报表中增加班级筛选

1.增加老师端可以看到年级卷
2.考试情况中显示出班级所有学生 3.年级分析报表中增加班级筛选
jack
1 parent 8791e5b3
Showing 12 changed files with 125 additions and 27 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
WebRoot/WEB-INF/jsp/sunvote/paper/test_list3.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
WebRoot/static/js/control_template.js
resources/mybatis1/sunvote/PaperMapper.xml
resources/mybatis1/sunvote/StudentTestMapper.xml
src/com/fh/controller/sunvote/paper/PaperController.java
src/com/fh/controller/sunvote/report/ReportController.java
src/com/fh/service/sunvote/paper/PaperManager.java
src/com/fh/service/sunvote/paper/impl/PaperService.java
@@ -33,8 +33,7 @@
     <![endif]-->
 </head>
 <body>
-
-	<form action="../paper/list2.do" method="post" name="Form" id="Form">
+	<form action="../paper/list2.do?SCHOOL_ID=${pd.SCHOOL_ID }" method="post" name="Form" id="Form">
 		<div class="head_box">
 		<div class="box_header">
 			<div class="head_box_l">
@@ -58,9 +57,7 @@
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
+				<col style="width: 17%" />
 				<thead>
 					<tr>
 						<th><input type="checkbox"  name='ids' id="ids" />序号</th>
@@ -84,23 +81,24 @@
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
+				<col style="width: 17%" />
 				<tbody>
 				<c:choose>
 					<c:when test="${not empty varList}">
 						<c:forEach items="${varList}" var="var" varStatus="vs">
 							<tr>
 								<td><input type="checkbox" name='ids' id="ids" value="${var.PAPER_ID}"/>${vs.index+1}</td>
-								<td ><a  target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td>
+								<td ><a  target="_blank" style="display: inline-block;width: 100px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}" title="${var.TITLE}">${var.TITLE}</a></td>
 								<td >${var.CREATE_DATE}</td>
 								<td >${var.EXAM_TIME}</td>
 								<td >${var.TEST_NUM}</td>
 								<td >${var.SCORE}</td>
 								<td>
 								<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>
-								<a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
+								<c:if test="${var.PAPER_TYPE ==2 }">
+									<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep3.do?MB1=${pd.MB1 }&PAPER_ID=${var.PAPER_ID}">年级分析</a>
+								</c:if>
+								<a href="#" onclick="del('${var.PAPER_ID}');" style="float:right"><img src="../static/images/remove.png" /></a>
 								</td>
 							</tr>
@@ -108,7 +108,7 @@
 								<td >${var.SCORE}</td>
 								<td>
 								<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?MB1=nj&paper_id=${var.PAPER_ID}">查看成绩</a>
-								<a href="<%=basePath%>paper/paperRep3.do?MB1=${pd.MB1 }&PAPER_ID=${var.PAPER_ID}">年级分析</a>
+								<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep3.do?MB1=${pd.MB1 }&PAPER_ID=${var.PAPER_ID}">年级分析</a>
 								<a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
 								</td>
 							</tr>
@@ -37,7 +37,7 @@
 </head>
 <body>
-	<form action="../paper/list4.do" method="post" name="Form" id="Form">
+	<form action="../paper/paperRep3.do" method="post" name="Form" id="Form">
 		<div class="head_box">
 		<div class="box_header">
 			<div class="head_box_l">
@@ -57,13 +57,24 @@
 		</div>
 		<div class="table_box" style="padding:0 5%;background:#fff;">
 			<div style="padding:15px 0;background:#fff;" class="paper_title">
-			
+				<input type="hidden" name="PAPER_ID" id="PAPER_ID" valu="${pd.PAPER_ID }" />
 				${pd.MB1=="nj"?"年级卷":"个人卷"} > 班级对比 > 答题分析
 				<br/>
 				<br/>
 				<br/>
 				&nbsp;
-				<b>试卷名称：</b>${pd.PAPER_NAME}
+				<b>试卷名称：</b>${pd.PAPER_NAME}  
+				<div style="float:right">       
+				<b>班级名称：</b>
+				<select class="chosen-select form-control" style="width:120px; display:inline-block" name="CLASS_ID" id="CLASS_ID" data-placeholder="选择班级">
+					<option value="">全部</option>
+					<c:forEach var="item" items="${sclass}">
+						<option value="${item.CLASS_ID}"  <c:if test="${pd.CLASS_ID==item.CLASS_ID}">selected="true"</c:if>>${item.CLASS_NAME}</option>
+					</c:forEach>
+				</select>
+				<a href="#" onclick="tosearch();"><img
+					src="../static/images/search.png" /></a>
+					</div>
 				<br>
 				<br>&nbsp;
 				<b>试卷总分：</b>${pd.SCORE}
@@ -161,14 +172,15 @@
 		            removeOriginal: true
 		        	};
-       		$("#simple-table").tablescroller(options);
+       		//$("#simple-table").tablescroller(options);
 		});
 		function tosearch(){
 			window.top.loading.remove();
-			$("#Form").submit();
+			location.href="<%=basePath%>paper/paperRep3.do?PAPER_ID=${pd.PAPER_ID}&CLASS_ID="+$("#CLASS_ID option:selected").val();
+			//$("#Form").submit();
 		}
 		$('#ids').on('click', function(){
@@ -243,7 +255,7 @@
 			window.top.remove.show();
 		}
 		function export3(){
-			window.open("<%=basePath%>paper/export3?PAPER_ID=${pd.PAPER_ID}","_blank");
+			window.open('<%=basePath%>paper/export3?PAPER_ID=${pd.PAPER_ID}&CLASS_ID='+$("#CLASS_ID option:selected").val(),"_blank");
 		}
 </script>
@@ -269,7 +269,7 @@
 					});
 			$("#qingsongkao_paper").click(function() {
-				var path = "../paper/list2.do?";
+				var path = "../paper/list2.do?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}";
 				//$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
 				if ($("#mainFrame").attr('src') != (path)) {
 					$("#mainFrame").attr('src', path);
@@ -285,7 +285,7 @@
 				//}
 			});
-			var defaultUrl = '${pd.DEFAULTURL}';
+			var defaultUrl = '${pd.DEFAULTURL}?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}';
 			if (defaultUrl != '' && defaultUrl != '') {
 				$("#mainFrame").attr('src', defaultUrl);
 			}
@@ -126,13 +126,29 @@
 										 ${var.NAME}
 										 </div>
 									</td>
-									<td class="center"><div style="width:150px;"><fmt:formatNumber type="number"
+									<td class="center"><div style="width:150px;">
+									<c:if test="${not empty var.GETSCORE}">
+									<fmt:formatNumber type="number"
 											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
-											maxFractionDigits="2" />%</div></td>
-									<td class="center"><div style="width:80px;margin:0 auto;">${var.GETSCORE }</div></td>
+											maxFractionDigits="2" />%
+									</c:if>
+									<c:if test="${empty var.GETSCORE }">--</c:if>
+											</div></td>
+									<td class="center"><div style="width:80px;margin:0 auto;">
+									<c:if test="${not empty var.GETSCORE}">
+									${var.GETSCORE }
+									</c:if>
+									<c:if test="${empty var.GETSCORE}">
+									--
+									</c:if>
+									</div></td>
 									<c:forEach items="${testpaperList}" var="var1" varStatus="vs1">
 										<td class="center"><div style="width:180px;margin:0 auto;"><c:set var="TEST_ID"
-												value="${var1.TESTPAPER_ID}" /> ${var[TEST_ID] }</div></td>
+												value="${var1.TESTPAPER_ID}" /> 
+												
+									${empty var[TEST_ID]?"--":var[TEST_ID]}
+									
+												</div></td>
 									</c:forEach>
 								</tr>
 							</c:forEach>
@@ -202,8 +202,11 @@ $(function() {
 										score: $(".section").eq(i).attr("data-fraction")
 								};	
 							}
+							self.location.href = URL + JSON.stringify(content) + "&page_score=" + total_score;
+						}
+						else{
+							alert("模板内容不能为空");
 						}
-						self.location.href = URL + JSON.stringify(content) + "&page_score=" + total_score;
 					});
 	/* ajax封装函数 */
@@ -249,6 +249,29 @@
         </choose>
 	</select>
+	<!-- 查找指定老师卷和年级卷 -->
+	<select id="listAllBySidAndTid" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 1 = 1
+		AND 
+		(SCHOOL_ID = #{SCHOOL_ID} AND PAPER_TYPE = '2') OR 
+		(USER_ID = #{USER_ID} AND PAPER_TYPE = #{PAPER_TYPE}) 	
+		
+		order by CREATE_DATE DESC
+		
+		<choose>
+              <when test="CURRENTPAGE != null and CURRENTPAGE != '' and SHOWCOUNT != null and SHOWCOUNT != ''">
+                  limit ${CURRENTPAGE}, ${SHOWCOUNT}
+              </when>
+              <otherwise>
+                  limit 0,30
+              </otherwise>
+        </choose>
+	</select>
+	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
 		delete from
@@ -108,6 +108,9 @@
 			LEFT JOIN sv_student on sv_studenttest.STUDENT_ID = sv_student.ID
 		where 
 			sv_studenttest.PAPER_ID =  #{PAPER_ID}
+			<if test="CLASS_ID != null and CLASS_ID != ''">
+				and sv_studenttest.CLASS_ID=#{CLASS_ID}
+			</if>
 	</select>
 	<!-- 列表 -->
@@ -734,7 +734,9 @@ public class PaperController extends BaseController {
 	public ModelAndView paperRep3() throws Exception {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
+		pd=this.getPageData();
 		List<PageData> temp = new ArrayList<PageData>();
+		List<PageData> sclass_list = new ArrayList<PageData>();
 		PageData saveData = new PageData();
 		ResponseGson<PageData> res = new ResponseGson();
@@ -750,9 +752,13 @@ public class PaperController extends BaseController {
 			List<String> sid = new ArrayList<String>();
 			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();
+				
+				
 				p.put("ID", item.getString("STUDENT_ID"));
 				PageData student = stundentService.findById(p);
 				if (student != null) {
@@ -793,6 +799,13 @@ public class PaperController extends BaseController {
 						PageData stu = new PageData();
 						stu.put("STUDENT_NAME", item.get("STUDENT_NAME"));
 						stu.put("CLASS_NAME", item.get("CLASS_NAME"));
+						if(!classId.contains(item.getString("CLASS_ID"))){
+							classId.add(item.getString("CLASS_ID"));
+							sclass.put("CLASS_ID", item.get("CLASS_ID"));
+							sclass.put("CLASS_NAME", item.get("CLASS_NAME"));
+							sclass_list.add(sclass);
+						}
+						
 						List<PageData> testList = new ArrayList<PageData>();
 						PageData test = new PageData();
 						test.put("CREATE_DATE", item.get("CREATE_DATE"));
@@ -810,6 +823,7 @@ public class PaperController extends BaseController {
 						stu.put("LOST_NUM", lost_num);
 						sid.add(item.getString("STUDENT_ID"));
 						temp.add(stu);
+						
 					}
 				}
 			}
@@ -829,7 +843,9 @@ public class PaperController extends BaseController {
 			}
 		});
+		
 		mv.setViewName("sunvote/paper/test_list3");
+		mv.addObject("sclass", sclass_list);
 		mv.addObject("varList", temp);
 		mv.addObject("pd", pd);
 		res.setData(saveData);
@@ -1171,7 +1187,7 @@ public class PaperController extends BaseController {
 		pd.put("USER_ID", userID);
 		pd.put("PAPER_TYPE", "1");
 		page.setPd(pd);
-		List<PageData> varList = paperService.list(page); // 列出Paper列表
+		List<PageData> varList = paperService.listAllBySidAndTid(pd); // 列出Paper列表
 		page.setLangIsChina(isChineseLanguageClient());
 		if (isChineseLanguageClient()) {
 			mv.setViewName("sunvote/paper/paper_list2");
@@ -90,6 +90,7 @@ public class ReportController extends BaseController {
 		List<PageData> reportData = v1Service.classReport(pd);
 		List<PageData> testpaperList = new ArrayList();
 		List<PageData> studentList = new ArrayList();
+		List<String> studentId = new ArrayList();
 		PageData studentPd = null;
 		double totalScore = 0 ;
 		double getScore = 0 ;
@@ -128,6 +129,7 @@ public class ReportController extends BaseController {
 					studentPd.put("TOTALSCORE", totalScore);
 					studentPd.put("GETSCORE", getScore);
 					studentList.add(studentPd);
+					studentId.add(studentPd.getString("STUDENT_ID"));
 					totalScore = 0 ;
 					getScore = 0 ;
 				}
@@ -173,6 +175,7 @@ public class ReportController extends BaseController {
 			studentPd.put("TOTALSCORE", totalScore);
 			studentPd.put("GETSCORE", getScore);
 			studentList.add(studentPd);
+			studentId.add(studentPd.getString("STUDENT_ID"));
 			totalScore = 0 ;
 			getScore = 0 ;
 		}
@@ -190,7 +193,14 @@ public class ReportController extends BaseController {
 		mv.addObject("testpaperList", testpaperList);
 		info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
-		
+		List<PageData> student_class = studentService.findByClassId(pd);
+		for(int x = 0;x<student_class.size();x++){
+			if(studentId.contains(student_class.get(x).getString("ID"))){
+				continue;
+			}else{
+				studentList.add(student_class.get(x));
+			}
+		}
 		mv.addObject("studentList", studentList);
 		info.put("STUDENT_NUM", studentList != null ? studentList.size() : 0);
 		mv.addObject("info", info);
@@ -39,6 +39,9 @@ public interface PaperManager{
 	public List<PageData> listAllByType(PageData pd)throws Exception;
+	public List<PageData> listAllBySidAndTid(PageData pd)throws Exception;
+	
+	
 	/**列表(全部)
 	 * @param pd
 	 * @throws Exception
 package com.fh.service.sunvote.paper.impl;
 import java.util.List;
+
 import javax.annotation.Resource;
+
 import org.springframework.stereotype.Service;
+
 import com.fh.dao.DaoSupport;
 import com.fh.entity.Page;
-import com.fh.util.PageData;
 import com.fh.service.sunvote.paper.PaperManager;
+import com.fh.util.PageData;
 /** 
  * 说明： 试卷
@@ -70,6 +73,17 @@ public class PaperService implements PaperManager{
 		return (List<PageData>)dao.findForList("PaperMapper.listAllByTypelistPage", pd);//.*listPage.*
 	}
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAllBySidAndTid(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("PaperMapper.listAllBySidAndTid", pd);//.*listPage.*
+	}
+	
+	
 	/**列表(全部)
 	 * @param pd
 	 * @throws Exception