管理员功能完善

孙向锦
1 parent 4b6a5239
Showing 8 changed files with 84 additions and 22 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
WebRoot/static/js/control-604.js
resources/mybatis1/sunvote/TestPaperMapper.xml
src/com/fh/controller/api/V1.java
src/com/fh/controller/sunvote/paper/PaperController.java
src/com/fh/controller/sunvote/report/ReportController.java
@@ -262,17 +262,17 @@
 		}
 		function report(classId){
-			//window.open('<%=basePath%>report/report.do?classid=' + classId);
-			//if($("#mainFrame").attr('src') != ('<%=basePath%>report/report.do?classid=' + classId)){
-				$("#mainFrame").attr('src','<%=basePath%>report/report.do?classid=' + classId);
+			//window.open('<%=basePath%>report/report.do?role=admin&classid=' + classId);
+			//if($("#mainFrame").attr('src') != ('<%=basePath%>report/report.do?role=admin&classid=' + classId)){
+				$("#mainFrame").attr('src','<%=basePath%>report/report.do?role=admin&classid=' + classId);
 				window.top.loading.show();
 			//}
 		}
 		function report2(classId){
 			//window.open('<%=basePath%>report/report.do?classid=' + classId);
 			//if($("#mainFrame").attr('src') != ('<%=basePath%>report/report.do?classid=' + classId)){
-				$("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
-				window.top.loading.show();
+			//	$("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId);
+			//	window.top.loading.show();
 			//}
 		}
@@ -313,8 +313,8 @@
 		$("#jishice_paper").click(function (){
 			var path = "../teacher/teach_paper.do?school_id=" + schoolId;
 			//if($("#mainFrame").attr('src') != (path)){
-				$("#mainFrame").attr('src',path);
-				window.top.loading.show();
+		//		$("#mainFrame").attr('src',path);
+		//		window.top.loading.show();
 			//}
 		});
 	</script>
@@ -33,6 +33,7 @@
 	<div style="padding:20px 20px;">
 		<form action="report/report.do" method="post" name="Form" id="Form" style="margin-bottom:0;">
 			<input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
+			<input type="hidden" name="ROLE" id="ROLE" value="${pd.ROLE}" />
 			<table style="margin-top:5px;margin-bottom:20px;">
 				<tr>
 					<td><div style="width:150px;text-align:center;">课程统计: ${info.testsize}</div></td>
@@ -40,6 +41,16 @@
 					<td><div style="width:150px;text-align:center;"><span>学生人数: ${info.STUDENT_NUM}</span></div></td>
 					<td></td>
+					<c:if test="${not empty subjectInfos}">
+						<td>
+							<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属学校">
+										<option value="">全部</option>
+										<c:forEach var="item" items="${subjectInfos}">
+											<option value="${item.SUBJECT_ID}" <c:if test="${pd.SUBJECT_ID == item.SUBJECT_ID }">selected = ture</c:if>>${item.SCNAME}</option>
+										</c:forEach>
+							</select>
+						</td>
+					</c:if>
 					<td style="padding-left:2px;">
 					<input
 						class="span10 date-picker" name="lastStart" id="lastStart"
@@ -211,6 +222,7 @@
 					});
 		});
+		var role = '${pd.ROLE}';
 		function precent(avg,total){
 			if(total == 0){
@@ -223,7 +235,11 @@
 			var url = "<%=basePath%>report/report.do?classid=${info.CLASS_ID}" ;
 			var startDate = $("#lastStart").val();
 			var endDate =  $("#lastEnd").val();
-			url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
+			var subject_id =  $("#SUBJECT_ID").val();
+			url = url + "&start_date=" + startDate + "&end_date=" + endDate + "&SUBJECT_ID=" + subject_id;
+			if(role == "admin"){
+				url = url + "&ROLE=admin" ;
+			}
 			window.location.href = url;
 			/* $("#Form").sumbit(); */
 		}
@@ -93,7 +93,7 @@
 									<%-- <td class="center">${var.RIGHT}</td> --%>
 									<td class="center"><div style="width:80px;">${vs.index + 1}</div></td>
 									<c:forEach items="${questionInfo}" var="var1" varStatus="vs1">
-										<td class="center"><div style="width:80px;margin:0 auto;">${var.detail[vs1.index].ANSWER}</div></td>
+										<td class="center" <c:if test="${var.detail[vs1.index].RIGHT== '1'}">style="background:#0bb8b9"</c:if>div style="width:80px;margin:0 auto;">${var.detail[vs1.index].ANSWER}</div></td>
 									</c:forEach>
 									<%-- <td class="center">${var.OTHER_SCORE}</td> --%>
 									<td class="center"><div style="width:80px;margin:0 auto;">${var.GETSCORE}</div></td>
-$(function(){
+	var questionNUm = 0 ;
+$(function(){
 	/*快速创建答案列表*/
 	var score=0;
 	var total_score = 0;
-	var questionNUm = 0 ;
+
 	function creat(str_ans,a_num,fraction){
 //		$(".section").remove();
 		answer_index_b=$(".section").length+1;
@@ -16,7 +17,7 @@
 			}
 		}
 		q_num=str.length;
-		$(".content").append('<div class="section section-' + answer_index_b +' single" data-fraction="'+fraction+'" data-score="'+(q_num * fraction)+'"><div class="title"><h3>第' +answer_index_b +'大题总分: ' + (q_num * fraction)+'分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span> --></h3> </div><div class="question_list"></div></div>');
+		$(".content").append('<div class="section section-' + answer_index_b +' single" data-fraction="'+fraction+'" data-score="'+(q_num * fraction)+'"><div class="title"><h3>第' +answer_index_b +'大题总分: ' + q_num + ' X ' + fraction + ' = ' + (q_num * fraction)+' 分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span> --></h3> </div><div class="question_list"></div></div>');
 		for(var i=0;i<q_num;i++){
 			str_temp=str[i];
 			str_temp=str_temp.toUpperCase()
@@ -112,7 +113,7 @@
 				}*/
 			case 5:                                             //多选题
 //				$(".content").html("");
-				$(".content").append('<div class="section section-'+ answer_index_b +' check" data-fraction="'+fraction2+'" data-score="' + ((index_e_2- index_s_2 + 1 )* fraction2)+ '"> <div class="title"><h3>第' +answer_index_b +'大题总分: ' + ((index_e_2- index_s_2 + 1 )* fraction2)+'分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
+				$(".content").append('<div class="section section-'+ answer_index_b +' check" data-fraction="'+fraction2+'" data-score="' + ((index_e_2- index_s_2 + 1 )* fraction2)+ '"> <div class="title"><h3>第' +answer_index_b +'大题总分: ' + (index_e_2- index_s_2 + 1 ) + ' X ' + fraction2 + ' = ' + ((index_e_2- index_s_2 + 1 )* fraction2)+' 分<!--<span>请在试题选项上点击，亮色为该试题的正确答案&nbsp; </span>--></h3> </div> <div class="question_list"></div></div>');
 				for(var i=index_s_2;i<=index_e_2;i++){
 						questionNUm++;
 						$(".section-" + answer_index_b +" .question_list").append('<div class="question question'+questionNUm+'"><span>'+questionNUm+'、</span><ul></ul></div>');
@@ -379,12 +380,12 @@ function creatHtml(data){
 		for(var i=0;i<data.questions.length;i++){
 			if(data.questions[i].questions){
-				$(".content").append('<div class="section section-'+i+'" data-fraction="'+data.questions[i].score+'" style="margin-top:20px;"> <h3><span class="que_num">'+'第'+ (i+1) + '大题总分:'+ data.questions[i].sug_score +'</span>'+'<span class="que_name">'+data.questions[i].content+'</span></h3><!-- <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> --> <div class="question_list"></div></div>');
+				$(".content").append('<div class="section section-'+i+'" data-fraction="'+data.questions[i].score+'" style="margin-top:20px;"> <h3><span class="que_num">'+'第'+ (i+1) + '大题总分:'+data.questions[i].questions.length + " X " + (parseFloat(data.questions[i].sug_score) / data.questions[i].questions.length) + " = " +  data.questions[i].sug_score +'</span>'+'<span class="que_name">'+data.questions[i].content+'</span></h3><!-- <input type="button" class="btn btn-danger pull-right remove" name="remove" value="删除" /> --> <div class="question_list"></div></div>');
 			}else{
 				if(i == 0){
 					$(".content").append('<div class="section section0"> <div class="question_list"></div></div>');
 				}
-				$(".section0").find(".question_list").append('<div class="question question'+(i+1)+'"><span>'+(i+1)+'、</span><ul></ul></div>');	
+				$(".section0").find(".question_list").append('<div class="question question'+(i+1)+'"><span>'+(++questionNUm)+'、</span><ul></ul></div>');	
 				for(var k=0;k<parseInt(data.questions[i].option_num);k++){
 					str_temp=data.questions[i].answer;
 					$(".section0").find(".question"+(i+1)+' ul').append('<li class="btn btn-default">'+String.fromCharCode(0x41+k)+'</li>');
@@ -401,7 +402,7 @@ function creatHtml(data){
 			if(data.questions[i].questions){
 				for(var j=0;j<data.questions[i].questions.length;j++){
-					$(".section-"+i).find(".question_list").append('<div class="question question'+(j+1)+'"><span>'+(j+1)+'、</span><ul></ul></div>');	
+					$(".section-"+i).find(".question_list").append('<div class="question question'+(j+1)+'"><span>'+(++questionNUm)+'、</span><ul></ul></div>');	
 					if($(".section-"+i).find(".que_name").text()=="判断题"){
 						for(var k=0;k<parseInt(data.questions[i].questions[j].option_num);k++){
 							str_temp=data.questions[i].questions[j].answer;
@@ -23,6 +23,7 @@
 		TOTAL_SCORE,	
 		REMARK,	
 		TEST_TYPE,	
+		SUBJECT_ID,
 		TESTPAPER_ID
 	</sql>
@@ -42,6 +43,7 @@
 		#{TOTAL_SCORE},	
 		#{REMARK},	
 		#{TEST_TYPE},	
+		#{SUBJECT_ID},	
 		#{TESTPAPER_ID}
 	</sql>
@@ -83,6 +85,7 @@
 			TOTAL_SCORE = #{TOTAL_SCORE},
 			REMARK = #{REMARK},
 			TEST_TYPE = #{TEST_TYPE},
+			SUBJECT_ID = #{SUBJECT_ID},
 		TESTPAPER_ID = TESTPAPER_ID
 		where 
 		TESTPAPER_ID = #{TESTPAPER_ID}
@@ -143,6 +146,9 @@
 		<if test="NAME != null and NAME != ''"><!-- 关键词检索 -->
 			and (NAME = #{NAME})
 		</if>
+		<if test="SUBJECT_ID != null and SUBJECT_ID != ''"><!-- 关键词检索 -->
+			and (SUBJECT_ID = #{SUBJECT_ID})
+		</if>
 		<if test="TEST_TYPE != null and TEST_TYPE == '1'.toString()"><!-- 关键词检索 -->
 			and (TEST_TYPE = #{TEST_TYPE} or TEST_TYPE IS NULL)
 		</if>
@@ -185,6 +191,9 @@
 		<if test="TEACHER_ID != null and TEACHER_ID != ''"><!-- 关键词检索 -->
 			and (TEACHER_ID = #{TEACHER_ID})
 		</if>
+		<if test="SUBJECT_ID != null and SUBJECT_ID != ''"><!-- 关键词检索 -->
+			and (SUBJECT_ID = #{SUBJECT_ID})
+		</if>
 		<if test="CREATE_DATE != null and CREATE_DATE != ''"><!-- 关键词检索 -->
 			and (CREATE_DATE = #{CREATE_DATE})
 		</if>
@@ -1787,7 +1787,9 @@ public class V1 extends BaseController {
 							}
 						}
 					}
-					testpaperinfoService.batchSave(testInfoPdList);
+					if(testInfoPdList.size() > 0){
+						testpaperinfoService.batchSave(testInfoPdList);
+					}
 				}
 				res.setData(testPaperId);
 			} catch (Exception e) {
@@ -255,10 +255,13 @@ public class PaperController extends BaseController {
 		Session session = Jurisdiction.getSession();
 		User user = (User)session.getAttribute(Const.SESSION_USER);
 		paper.setUser_id(user.getUSER_ID());
-		paper.setPaper_type(paperType == null ? "1" :paperType);
-		paper.setSubject_id(pd.getString("SUBJECT_ID") == null ? getSubjectId():pd.getString("SUBJECT_ID"));
-		paper.setGrade_id(pd.getString("GRADE_ID") == null ? getGradeID() : pd.getString("GRADE_ID"));
-		paper.setSchool_id(pd.getString("SCHOOL_ID") == null ? getSchoolID() : pd.getString("SCHOOL_ID"));
+		paper.setPaper_type(paperType == null || "".equals(paperType.trim()) ? "1" :paperType);
+		String subjectId = pd.getString("SUBJECT_ID");
+		paper.setSubject_id(subjectId == null || "".equals(subjectId.trim())? getSubjectId():subjectId);
+		String gradeId = pd.getString("GRADE_ID");
+		paper.setGrade_id( gradeId== null || "".equals(gradeId.trim())? getGradeID() : gradeId);
+		String schoolId = pd.getString("SCHOOL_ID") ;
+		paper.setSchool_id(schoolId == null || "".equals(schoolId.trim())? getSchoolID() : schoolId);
 		paper.setQuestions(new ArrayList<Question>());
 		pd.put("JSON", paper.toJson());
@@ -14,6 +14,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.fh.controller.api.ResponseGson;
 import com.fh.controller.base.BaseController;
+import com.fh.service.api.V1Manager;
 import com.fh.service.sunvote.sclass.SClassManager;
 import com.fh.service.sunvote.student.StudentManager;
 import com.fh.service.sunvote.studenttest.StudentTestManager;
@@ -41,6 +42,9 @@ public class ReportController extends BaseController {
 	@Resource(name="testpaperinfoService")
 	private TestPaperInfoManager testpaperinfoService;
+	@Resource(name = "v1Service")
+	private V1Manager v1Service;
+	
 	@RequestMapping(value="/report")
@@ -51,7 +55,30 @@ public class ReportController extends BaseController {
 		pd.put("SCLASS_ID", pd.get("CLASSID"));
 		pd.put("ID", pd.get("CLASSID"));
 		pd.put("TEST_TYPE", "1");
-		pd.put("TEACHER_ID", getUserID());
+		String role = pd.getString("ROLE");
+		if( role != null && "admin".equals(role)){
+			PageData tpd = new PageData();
+			tpd.put("ID", getUserID());
+			List<PageData> adminInfos = v1Service.getAdminInfo(tpd);
+			List<PageData> subjectInfos = new ArrayList<PageData>();
+			for(PageData pad : adminInfos){
+				PageData tmpd = new PageData();
+				Object gradeId = pad.get("GRADE_ID");
+				tmpd.put("SNAME", pad.get("SNAME"));// 学校名称
+				tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID
+				tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id
+				tmpd.put("GNAME", pad.get("GNAME"));//年级名称
+				tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id
+				tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称
+				if(gradeId != null && !"".equals(gradeId)){
+				}else{
+					subjectInfos.add(tmpd);
+				}
+			}
+			mv.addObject("subjectInfos", subjectInfos);
+		}else{
+			pd.put("TEACHER_ID", getUserID());
+		}
 		// 1 查询班级信息
 		PageData classPageData = sclassService.findById(pd);
 		PageData info = new PageData();
@@ -60,6 +87,9 @@ public class ReportController extends BaseController {
 		info.put("CLASS_ID", classPageData.getString("ID"));
 		pd.put("CLASS_ID", pd.get("CLASSID"));
 		List<PageData> studentList = studentService.listAllClass(pd);
+		
+		
+		
 		// 2查询班级考试
 		pd.put("TEST_TYPE", "1");
 		List<PageData> testpaperList = testpaperService.listAll(pd);
@@ -110,6 +140,7 @@ public class ReportController extends BaseController {
 		mv.addObject("info", info);
 		mv.addObject("start_date", pd.get("START_DATE"));
 		mv.addObject("end_date", pd.get("END_DATE"));
+		mv.addObject("pd", pd);
 		mv.setViewName("sunvote/teacher/teacher_report_1");
 		return mv;
 	}