From 4b6a5239ca0932b92e96c558798f6fb2d7c8e840 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Thu, 25 Oct 2018 15:29:40 +0800
Subject: [PATCH] 管理员界面

---
 WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp             |  70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp            | 223 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp            | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp       |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp         | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/static/js/control-604.js                             |   1 +
 WebRoot/static/js/teach_paper1.js                            | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 resources/mybatis1/sunvote/PaperMapper.xml                   |  14 ++++++++++++++
 src/com/fh/bean/Paper.java                                   |  10 ++++++++++
 src/com/fh/controller/api/V1.java                            |   6 ++++--
 src/com/fh/controller/sunvote/Myelfun.java                   |   2 +-
 src/com/fh/controller/sunvote/paper/PaperController.java     | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/com/fh/controller/sunvote/teacher/TeacherController.java |  19 +++++++++++++++++++
 13 files changed, 1043 insertions(+), 17 deletions(-)
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
 create mode 100644 WebRoot/static/js/teach_paper1.js

diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index a16468e..ea5d709 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -92,7 +92,12 @@
 			<p>试卷管理<span class="right jiao"></span></p>
 				<ul class="menu_1">
 					<li >
-						<p id="qingsongkao_paper">轻松考试卷管理</p>
+						<p >轻松考试卷管理</p>
+						<ul class="menu_2">
+							<li ><p id="new_paper">出卷</p></li>
+							<li ><p id="qingsongkao_paper">查看所有试卷</p></li>
+							
+						</ul>
 					</li>
 					<li>
 						<p id="jishice_paper">即时测试卷管理</p>
@@ -107,18 +112,29 @@
 			
 			<ul class="menu_1">
 					<li >
-						<p>轻松考测验分析</p>
+						<p>轻松考统考</p>
+					</li>
+					<li >
+						<p>轻松考班级情况</p>
 						<ul class="menu_2">
-							<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-								<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
+							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
+								<c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
+									<li onclick="event.stopPropagation();report('${var1.ID}')">
+										<p>${ var1.CLASS_NAME }</p>
+									</li>
+								</c:forEach>
 							</c:forEach>
 						</ul>
 					</li>
 					<li>
 						<p>即时测测验分析</p>
 							<ul class="menu_2">
-							<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-								<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
+							<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
+								<c:forEach items="${var.classInfos}" var="var1" varStatus="vs1">
+									<li onclick="event.stopPropagation();report2('${var1.ID}')">
+										<p>${ var1.CLASS_NAME }</p>
+									</li>
+								</c:forEach>
 							</c:forEach>
 						</ul>
 					</li>
@@ -166,6 +182,7 @@
 			    </div>
 			    <div class="clearfix"></div>
 			</div>
+	       
 	        <div class="form-group">
 			    <label for="enter_time" class="col-sm-4 control-label">测验时长（分钟）</label>
 			    <div class="col-sm-6">
@@ -173,7 +190,28 @@
 			    </div>
 			    <div class="clearfix"></div>
 			</div>
-			
+			 <div class="form-group">
+			    <label for="enter_time" class="col-sm-4 control-label">年级</label>
+			    <div class="col-sm-6">
+			      <select class="chosen-select form-control" name="grade_id" id="grade_id" data-placeholder="这里输入所属学校">
+						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
+							<option value="${var.GRADE_ID}">${var.GNAME}</option>
+						</c:forEach>
+				</select>
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
+			 <div class="form-group">
+			    <label for="enter_time" class="col-sm-4 control-label">科目</label>
+			    <div class="col-sm-6">
+			      <select class="chosen-select form-control" name="subject_id" id="subject_id" data-placeholder="这里输入所属学校">
+						<c:forEach items="${subjectInfos}" var="var" varStatus="vs">
+							<option value="${var.SUBJECT_ID}">${var.SCNAME}</option>
+						</c:forEach>
+				</select>
+			    </div>
+			    <div class="clearfix"></div>
+			</div>
 	      </div>
 	      <div class="modal-footer">
 	        <button type="button" class="btn btn-primary" id="time_submit">确定</button>
@@ -191,6 +229,7 @@
 	<script src="../static/js/dailog.js"></script>
 	<script type="text/javascript">
 	
+		var schoolId = '${SCHOOL_ID}';
 		function subject(school_id){
 			var path = "../subject/listcs.do?school_id=" + school_id ;
 			//if($("#mainFrame").attr('src') != (path)){
@@ -240,10 +279,12 @@
 		$("#time_submit").click(function(){
 			var name = $("#enter_title").val();
 			var time = $("#enter_time").val();
+			var grade_id = $("#grade_id").val();
+			var subject_id = $("#subject_id").val();
 			if(name != null&& name != '' && time != null && time != ''){
 				var itime = parseInt(time);
 				if(itime > 0 && itime <= 300){
-					self.location.href = "<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time ;
+					self.location.href = "<%=basePath%>" + "paper/npaper.do?paper_type=2&" + "name=" + name + "&grade_id=" + grade_id +"&subject_id=" + subject_id + "&school_id=" + schoolId + "&time=" + time ;
 					$(".title_time").modal("hide");
 				}else{
 					alert("请输入正确的时间，时间不能超过300分钟");
@@ -252,7 +293,16 @@
 		});
 		
 		$("#qingsongkao_paper").click(function (){
-			var path = "../paper/list2.do?" ;
+			var path = "../paper/list4.do?school_id=" + schoolId ;
+			//$(".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);
+				window.top.loading.show();
+			}
+		});
+		
+		$("#new_paper").click(function (){
+			var path = "../paper/list5.do?school_id=" + schoolId ;
 			//$(".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);
@@ -261,7 +311,7 @@
 		});
 		
 		$("#jishice_paper").click(function (){
-			var path = "../teacher/teach_paper.do?" ;
+			var path = "../teacher/teach_paper.do?school_id=" + schoolId;
 			//if($("#mainFrame").attr('src') != (path)){
 				$("#mainFrame").attr('src',path);
 				window.top.loading.show();
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
new file mode 100644
index 0000000..5fbd002
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
@@ -0,0 +1,223 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme() + "://"
+			+ request.getServerName() + ":" + request.getServerPort() + path + "/";
+%>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>中天电子-教育管理系统</title>
+
+<!-- Bootstrap -->
+<link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet">
+<link href="../static/css/teach.css" rel="stylesheet">
+<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
+<script src="../static/js/loading.js"></script>
+<script src="../static/js/remove.js?a=1"></script>
+<script src="../static/js/dailog.js"></script>
+
+<!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
+<!-- 警告：通过 file:// 协议（就是直接将 html 页面拖拽到浏览器中）访问页面时 Respond.js 不起作用 -->
+<!--[if lt IE 9]>
+      <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+      <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body>
+
+	<form action="../paper/list4.do" method="post" name="Form" id="Form">
+		<div class="head_box">
+		<div class="box_header">
+			<div class="head_box_l">
+				<p>
+					<span class="right_b"></span>试卷管理
+				</p>
+			</div>
+			<div class="head_box_r">
+				<input type="hidden" name="SCHOOL_ID" id="PAPER_ID" value="${pd.SCHOOL_ID}"/>
+				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
+				<input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" name="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTEND}"/>
+				 <a href="#" onclick="tosearch();"><img
+					src="../static/images/search.png" /></a>
+			</div>
+			<div class="clear"></div>
+			</div>
+			<div style="padding:0 5%;background:#fff;">
+				<table class="table table-striped">
+				<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: 10%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<thead>
+					<tr>
+						<th><input type="checkbox"  name='ids' id="ids" />序号</th>
+						<th>测验标题</th>
+						<th>年级</th>
+						<th>班级</th>
+						<th>出卷老师</th>
+						<th>创建时间</th>
+						<th>建议考试时长</th>
+						<th>总分</th>
+						<th>操作</th>
+					</tr>
+				</thead>
+			</table>
+			</div>
+		</div>
+		<div class="table_box">
+			<table class="table table-striped">
+				<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: 10%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<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 >${myelfun:findGradeName(var.GRADE_ID)}</td>
+								<td >${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
+								<td >${myelfun:findTeacherName(var.USER_ID)}</td>
+								<td >${var.CREATE_DATE}</td>
+								<td >${var.EXAM_TIME}</td>
+								<td >${var.SCORE}</td>
+								<td>
+								<a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
+								</td>
+							</tr>
+						
+						</c:forEach>
+					</c:when>
+					<c:otherwise>
+						<tr class="main_info">
+							<td colspan="100" class="center" >没有相关数据</td>
+						</tr>
+					</c:otherwise>
+				</c:choose>
+				</tbody>
+			</table>
+			<div class="footer">
+				<!-- <div class="creat">
+					<input type="button"  onclick="parent.$('.title_time').modal('show');" value="新建试卷" />
+				</div>
+				<div class="removeAll">
+					<input type="button" onclick="deleteAll()" value="批量删除" />
+				</div> -->
+				<div class="page_box">
+					
+					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</body>
+
+<%@ include file="../../system/index/foot2.jsp"%>
+<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
+<script type="text/javascript">
+		
+		$(document).ready(function(){
+			window.top.loading.remove();
+		});
+		
+		function tosearch(){
+			window.top.loading.remove();
+			$("#Form").submit();
+		}
+		
+		$('#ids').on('click', function(){
+				var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header
+				
+				$(".table_box .table").find('tbody > tr').each(function(){
+					var row = this;
+					if(th_checked) $(row).find('input[type=checkbox]').eq(0).prop('checked', true);
+					else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
+				});
+		});
+		
+		function del(Id){
+			//var remove = new remove();
+			window.top.remove.init({"title":"删除","func":function(success){
+				if(success){
+					var url = "<%=basePath%>paper/delete.do?PAPER_ID="+Id+"&qingsongkao=true&tm="+new Date().getTime();
+					window.top.loading.show();
+					$.get(url,function(data){
+						tosearch();
+					});
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			remove.show();
+		}
+		
+		$(function() {
+		
+			//日期框
+			$('.date-picker').datepicker({
+				autoclose: true,
+				todayHighlight: true
+			});
+		
+		});
+		
+		function deleteAll(){
+			window.top.remove.init({"title":"删除","func":function(success){
+				if(success){
+					var str = '';
+					for(var i=0;i < document.getElementsByName('ids').length;i++){
+					  if(document.getElementsByName('ids')[i].checked){
+					  	if(str=='') str += document.getElementsByName('ids')[i].value;
+					  	else str += ',' + document.getElementsByName('ids')[i].value;
+					  }
+					}
+					if(str==''){
+						
+					}else{
+						$.ajax({
+								type: "POST",
+								url: '<%=basePath%>paper/deleteAll.do?tm='+new Date().getTime(),
+						    	data: {DATA_IDS:str},
+								dataType:'json',
+								//beforeSend: validateData,
+								cache: false,
+								success: function(data){
+									 $.each(data.list, function(i, list){
+											tosearch();
+									 });
+								}
+							});
+					}
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
+		}
+		
+	
+</script>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
new file mode 100644
index 0000000..3aff9f0
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
@@ -0,0 +1,218 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+	pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme() + "://"
+			+ request.getServerName() + ":" + request.getServerPort() + path + "/";
+%>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>中天电子-教育管理系统</title>
+
+<!-- Bootstrap -->
+<link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet">
+<link href="../static/css/teach.css" rel="stylesheet">
+<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
+<script src="../static/js/loading.js"></script>
+<script src="../static/js/remove.js?a=1"></script>
+<script src="../static/js/dailog.js"></script>
+
+<!-- HTML5 shim 和 Respond.js 是为了让 IE8 支持 HTML5 元素和媒体查询（media queries）功能 -->
+<!-- 警告：通过 file:// 协议（就是直接将 html 页面拖拽到浏览器中）访问页面时 Respond.js 不起作用 -->
+<!--[if lt IE 9]>
+      <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+      <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body>
+
+	<form action="../paper/list5.do" method="post" name="Form" id="Form">
+		<div class="head_box">
+		<div class="box_header">
+			<div class="head_box_l">
+				<p>
+					<span class="right_b"></span>试卷管理
+				</p>
+			</div>
+			<div class="head_box_r">
+				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
+				<input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" name="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTEND}"/>
+				 <a href="#" onclick="tosearch();"><img
+					src="../static/images/search.png" /></a>
+			</div>
+			<div class="clear"></div>
+			</div>
+			<div style="padding:0 5%;background:#fff;">
+				<table class="table table-striped">
+				<col style="width: 5%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 5%" />
+				<thead>
+					<tr>
+						<th><input type="checkbox"  name='ids' id="ids" />序号</th>
+						<th>测验标题</th>
+						<th>创建时间</th>
+						<th>年级</th>
+						<th>科目</th>
+						<th>建议考试时长</th>
+						<th>总分</th>
+						<th>操作</th>
+					</tr>
+				</thead>
+			</table>
+			</div>
+		</div>
+		<div class="table_box">
+			<table class="table table-striped">
+				<col style="width: 5%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 5%" />
+				<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 >${var.CREATE_DATE}</td>
+								<td >${myelfun:findGradeName(var.GRADE_ID)}</td>
+								<td >${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
+								<td >${var.EXAM_TIME}</td>
+								<td >${var.SCORE}</td>
+								<td>
+								<a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
+								</td>
+							</tr>
+						
+						</c:forEach>
+					</c:when>
+					<c:otherwise>
+						<tr class="main_info">
+							<td colspan="100" class="center" >没有相关数据</td>
+						</tr>
+					</c:otherwise>
+				</c:choose>
+				</tbody>
+			</table>
+			<div class="footer">
+				<div class="creat">
+					<input type="button"  onclick="parent.$('.title_time').modal('show');" value="新建试卷" />
+				</div>
+				<div class="removeAll">
+					<input type="button" onclick="deleteAll()" value="批量删除" />
+				</div>
+				<div class="page_box">
+					
+					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</body>
+
+<%@ include file="../../system/index/foot2.jsp"%>
+<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
+<script type="text/javascript">
+		
+		$(document).ready(function(){
+			window.top.loading.remove();
+		});
+		
+		function tosearch(){
+			window.top.loading.remove();
+			$("#Form").submit();
+		}
+		
+		$('#ids').on('click', function(){
+				var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header
+				
+				$(".table_box .table").find('tbody > tr').each(function(){
+					var row = this;
+					if(th_checked) $(row).find('input[type=checkbox]').eq(0).prop('checked', true);
+					else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
+				});
+		});
+		
+		function del(Id){
+			//var remove = new remove();
+			window.top.remove.init({"title":"删除","func":function(success){
+				if(success){
+					var url = "<%=basePath%>paper/delete.do?PAPER_ID="+Id+"&qingsongkao=true&tm="+new Date().getTime();
+					window.top.loading.show();
+					$.get(url,function(data){
+						tosearch();
+					});
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			remove.show();
+		}
+		
+		$(function() {
+		
+			//日期框
+			$('.date-picker').datepicker({
+				autoclose: true,
+				todayHighlight: true
+			});
+		
+		});
+		
+		function deleteAll(){
+			window.top.remove.init({"title":"删除","func":function(success){
+				if(success){
+					var str = '';
+					for(var i=0;i < document.getElementsByName('ids').length;i++){
+					  if(document.getElementsByName('ids')[i].checked){
+					  	if(str=='') str += document.getElementsByName('ids')[i].value;
+					  	else str += ',' + document.getElementsByName('ids')[i].value;
+					  }
+					}
+					if(str==''){
+						
+					}else{
+						$.ajax({
+								type: "POST",
+								url: '<%=basePath%>paper/deleteAll.do?tm='+new Date().getTime(),
+						    	data: {DATA_IDS:str},
+								dataType:'json',
+								//beforeSend: validateData,
+								cache: false,
+								success: function(data){
+									 $.each(data.list, function(i, list){
+											tosearch();
+									 });
+								}
+							});
+					}
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
+		}
+		
+	
+</script>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
index d6ec68a..4725ad4 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -191,7 +191,7 @@
 <script>
 	var testData = ${pd.JSON};
 	var URL = "<%=basePath%>api/v1/uploadpaper";
-	var JUMP_URL = "<%=basePath%>/main/teacher";  
+	var JUMP_URL = "<%=basePath%>/${JUMP_URL}";  
 	if(testData.questions.length>0){
 		var title = testData.title;
 		if(title == null || title == ''){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
new file mode 100644
index 0000000..5209e79
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp
@@ -0,0 +1,128 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<!DOCTYPE html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>即时测</title>
+
+    <!-- Bootstrap -->
+    <link href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+	
+	<link rel="stylesheet" href="../static/ace/css/datepicker.css" />
+	<link href="../static/css/teach.css" rel="stylesheet">
+	<link href="../static/css/paper.css?t=1" rel="stylesheet">
+  </head>
+  <body>
+  
+	  <div class="head_box">
+		<div class="box_header">
+			<div class="head_box_l">
+				<p>
+					<span class="right_b"></span>即时测试卷管理
+				</p>
+			</div>
+			<div class="head_box_r">
+				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/> 
+				<input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" id="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value=""/>
+				<select name="dealer_id_2" id="dealer_id_2" class="selectpicker show-tick form-control"  data-width="98%" data-first-option="false" required data-live-search="true">
+					<!--班级列表-->
+				 </select>
+				 <a onclick="tosearch();"><img
+					src="../static/images/search.png" /></a>
+			</div>
+			<div class="clear"></div>
+			</div>
+			<div style="padding:0 5%;background:#fff;">
+				<table class="table table-striped">
+				<col style="width: 10%" />
+				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<thead>
+					<tr>
+						<th><input type="checkbox"  name='ids' id="ids" />序号</th>
+						<th>试卷名称</th>
+						<th>班级</th>
+						<th>科目</th>
+						<th>考试时长</th>
+						<th>创建时间</th>
+						<th>查看</th>
+						<th>操作</th>
+					</tr>
+				</thead>
+			</table>
+			</div>
+			<div class="clearfix"></div>
+		</div>
+		<div class="table_box">
+			<table class="table table-striped">
+				<col style="width: 10%" />
+				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<tbody id="tab_body">
+				
+				</tbody>
+			</table>
+	
+	
+			<div class="footer">
+				<!-- <div class="creat">
+					<input type="button"  id="creatPaper" value="新建试卷" />
+				</div>
+				<div class="removeAll">
+					<input type="button" onclick="deleteAll()" value="批量删除" />
+				</div> -->
+				<div class="page_box">
+					
+					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
+				</div>
+			</div>
+		</div>
+		<div class="modal fade" id="myModal" tabindex="-1" role="dialog">
+		  <div class="modal-dialog" role="document">
+			<div class="modal-content">
+			  <div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<h4 class="modal-title">请选择班级</h4>
+			  </div>
+			  <div class="modal-body">
+				<form class="form-horizontal">
+				  <div class="classList">
+					<ul>
+						
+					</ul>
+				  </div>
+				</form>
+			  </div>
+			  <div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary" id="submit" onclick="setQUestion()">确定</button>
+			  </div>
+			</div><!-- /.modal-content -->
+		  </div><!-- /.modal-dialog -->
+		</div><!-- /.modal -->
+  
+ 
+	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
+	<script src="../static/ace/js/bootbox.js"></script>
+	<script src="../static/js/teach_paper.js?a=2"></script>
+</html>
\ No newline at end of file
diff --git a/WebRoot/static/js/control-604.js b/WebRoot/static/js/control-604.js
index d666644..6eafc18 100644
--- a/WebRoot/static/js/control-604.js
+++ b/WebRoot/static/js/control-604.js
@@ -229,6 +229,7 @@
 		    subject_id: testData.subject_id,
 		    grade_id: testData.grade_id,
 		    user_id: testData.user_id,
+		    school_id: testData.school_id,
 		    score:total_score,
 		    questions:[]
 		}
diff --git a/WebRoot/static/js/teach_paper1.js b/WebRoot/static/js/teach_paper1.js
new file mode 100644
index 0000000..ecef41f
--- /dev/null
+++ b/WebRoot/static/js/teach_paper1.js
@@ -0,0 +1,245 @@
+		var url="";
+		var class_html="",
+			option_html="";
+		var user_id= "",
+			subject_id="",
+			class_id="";
+		$(document).ready(function(){
+			
+			timeList();
+			$.ajax({
+				url:url+"/SunvoteEducation/teacher/info",
+				async:false,
+				type:"post",
+				success:function(data){
+					console.log(data);
+					subject_id=data.data.subjectList[0].SUBJECT_ID;
+					user_id=data.data.ID;
+
+					if(data.data.classInfoList.length>0){
+						for(var i=0;i<data.data.classInfoList.length;i++){
+							class_html += '<li data-classId="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</li>';
+							option_html += '<option value="'+data.data.classInfoList[i].CLASS_ID+'">'+data.data.classInfoList[i].CLASS_NAME+'</option>'
+						}
+						$(".classList").html(class_html+'<div class="clearfix"></div>');
+						$(".classList li").eq(0).addClass("active");
+						$("#dealer_id_2").html(option_html);
+					}
+					getList();
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+				}
+			})
+
+			//日期框
+			$('.date-picker').datepicker({
+				autoclose: true,
+				todayHighlight: true
+			});
+			window.top.loading.remove();
+		})
+		
+		function getList(start_date,end_date,class_id){       //获取试卷列表
+			var tab_html="";
+			$.ajax({
+				url:url+"/SunvoteEducation/api/v1/paper",
+				async:false,
+				type:"post",
+				data:{
+					paper_type:"101",
+					user_id:user_id,
+					subject_id:subject_id,
+					class_id:class_id,
+					currentpage:"1",
+					showcount:"",
+					start_date:start_date,
+					end_date:end_date
+				},
+				success:function(data){
+					console.log(data);
+					for(var i=0;i<data.data.length;i++){
+						tab_html += '<tr data-id="'+data.data[i].PAPER_ID+'" data-classid="'+data.data[i].CLASS_ID+'"><td><input type="checkbox" name="ids" id="ids" value="'+data.data[i].PAPER_ID+'"/>'+(i+1)+'</td><td>'+data.data[i].TITLE+'</td><td>'+getClassName(data.data[i].CLASS_ID)+'</td><td>'+getSubjectName(data.data[i].SUBJECT_ID)+'</td><td>'+data.data[i].EXAM_TIME+'分钟</td><td>'+data.data[i].CREATE_DATE+'</td><td><a onclick="jump($(this))">查看</a></td><td><a href="#" onclick="del($(this));"><img src="../static/images/remove.png" /></a></td></tr>';
+					}
+					$("#tab_body").html(tab_html);
+					window.top.loading.remove();
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+			}
+			});
+		}
+		$('#ids').on('click', function(){
+				var th_checked = $("#ids").prop('checked');//checkbox inside "TH" table header
+				
+				$(".table_box .table").find('tbody > tr').each(function(){
+					var row = this;
+					if(th_checked) $(row).find('input[type=checkbox]').eq(0).prop('checked', true);
+					else $(row).find('input[type=checkbox]').eq(0).prop('checked', false);
+				});
+		});
+		function jump(obj){          //预览试卷
+			window.top.loading.show();
+			var id=obj.closest("tr").attr("data-id");
+			var classid=obj.closest("tr").attr("data-classid");
+			location.href="paper_view2.do?PAPER_ID="+id+"&classID="+classid+"&userid="+user_id;
+		}
+		$(".classList").on("click","li",function(){
+			$(this).siblings().removeClass("active");
+			$(this).addClass("active");
+			
+		});
+		$("#creatPaper").click(function(){   //新建试卷
+			$('#myModal').modal('show');
+		});
+		function setQUestion(){             //新建试卷-选择班级
+			if($(".classList .active").length>0){
+				class_id=$(".classList .active").attr("data-classid");
+				location.href="set_question.do?subject_id="+subject_id+"&class_id="+class_id+"&user_id="+user_id;
+			}else{
+				alert("请先选择班级");
+			}
+			window.top.loading.show();
+				console.log($(".classList .active").length);
+			//location.href="";
+		}
+		function getSubjectName(id){           //获取科目中文名
+			var subjectName="";
+			$.ajax({
+				url:url+"/SunvoteEducation/api/v1/subjectcname",
+				async:false,
+				type:"post",
+				data:{id:id},
+				success:function(data){
+					subjectName=data.data;
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+			}
+			})
+			return subjectName;
+		}
+		function getClassName(id){        //获取班级中文名
+			var className="";
+			$.ajax({
+				url:url+"/SunvoteEducation/api/v1/classname",
+				async:false,
+				type:"post",
+				data:{id:id},
+				success:function(data){
+					className=data.data;
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+				// 错误信息   
+				alert("状态码："+XMLHttpRequest.status+"状态："+XMLHttpRequest.readyState+"错误信息："+textStatus+"");
+				window.top.loading.remove();
+			}
+			})
+			return className;
+		}
+		function getday(month){         //获取日期
+			var time=[];
+			var  d= new Date();
+			 d.setMonth(month-1);
+			 d.setDate(1);
+			 var day=d.getDate();
+			 var month=d.getMonth()+1;
+			 if((d.getMonth()+1)<10){
+				 var month="0"+(d.getMonth()+1);
+			 }
+			 var year=d.getFullYear();
+			 var startTime=year+"-"+month+"-"+day;
+			 d.setMonth(month);
+			 var end_day=d.getDate();
+			 var end_month=d.getMonth()+1;
+			 if((d.getMonth()+1)<10){
+				 var end_month="0"+(d.getMonth()+1);
+			 }
+			 var end_year=d.getFullYear();
+			 var endTime=end_year+"-"+end_month+"-"+end_day;
+			 time[0]=startTime;
+			 time[1]=endTime;
+			 return time;
+		}
+		function timeList(){          //渲染时间列表
+			var time = new Date();
+			var now_month=time.getMonth()+1;
+			time.setMonth(now_month-1)
+			if(time.getMonth()!= 0 ){
+				var preceding_month = time.getMonth();
+			}else
+				var preceding_month = 12;
+			time.setMonth(now_month-2)
+			if(time.getMonth()!= 0 ){
+				var last_month = time.getMonth();
+			}else
+				var last_month = 12;
+			var option_html="";
+			option_html += '<option value="'+now_month+'">'+now_month+'月</option><option value="'+preceding_month+'">'+preceding_month+'月</option><option value="'+last_month+'">'+last_month+'月</option>';
+			$("#dealer_id_1").html(option_html);
+		}
+		function tosearch(){        //搜索
+			//var timeBox=getday($("#dealer_id_1").val());
+			var start_date=$("#lastStart").val();
+			var end_date=$("#lastEnd").val();
+			var class_id=$("#dealer_id_2").val();
+			getList(start_date,end_date,class_id);
+		}
+
+		function del(obj){       //删除
+			//var remove = new remove();
+			var id=obj.closest("tr").attr("data-id");
+			window.top.remove.init({"title":"删除","func":function(success){
+				if(success){
+					var url = "/SunvoteEducation/paper/delete.do?PAPER_ID="+id+"&tm="+new Date().getTime();
+					window.top.loading.show();
+					$.get(url,function(data){
+						tosearch();
+					});
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
+		}
+		function deleteAll(){       //批量删除
+			window.top.remove.init({"title":"删除","func":function(success){
+				if(success){
+					var str = '';
+					for(var i=0;i < document.getElementsByName('ids').length;i++){
+					  if(document.getElementsByName('ids')[i].checked){
+					  	if(str=='') str += document.getElementsByName('ids')[i].value;
+					  	else str += ',' + document.getElementsByName('ids')[i].value;
+					  }
+					}
+					if(str==''){
+						
+					}else{
+						$.ajax({
+								type: "POST",
+								url: '/SunvoteEducation/paper/deleteAll.do?tm='+new Date().getTime(),
+						    	data: {DATA_IDS:str},
+								dataType:'json',
+								//beforeSend: validateData,
+								cache: false,
+								success: function(data){
+									 $.each(data.list, function(i, list){
+											tosearch();
+									 });
+								}
+							});
+					}
+				}
+				else{
+					console.log("false");
+				}
+			}});
+			window.top.remove.show();
+		}
\ No newline at end of file
diff --git a/resources/mybatis1/sunvote/PaperMapper.xml b/resources/mybatis1/sunvote/PaperMapper.xml
index f8073a1..db9d5ad 100644
--- a/resources/mybatis1/sunvote/PaperMapper.xml
+++ b/resources/mybatis1/sunvote/PaperMapper.xml
@@ -138,6 +138,9 @@
 		<if test="pd.PAPER_TYPE != null and pd.PAPER_TYPE != ''"><!-- 关键词检索 -->
 			and PAPER_TYPE = #{pd.PAPER_TYPE}
 		</if>
+		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''"><!-- 关键词检索 -->
+			and SCHOOL_ID = #{pd.SCHOOL_ID}
+		</if>
 		
 		order by CREATE_DATE DESC
 	</select>
@@ -148,6 +151,11 @@
 		<include refid="Field"></include>
 		from 
 		<include refid="tableName"></include>
+		where 1 =1 
+		
+		<if test="SCHOOL_ID != null and SCHOOL_ID != ''"><!-- 关键词检索 -->
+			and SCHOOL_ID = #{SCHOOL_ID}
+		</if>
 		
 		order by CREATE_DATE DESC
 	</select>
@@ -172,6 +180,12 @@
 		<if test="pd.CLASS_ID != null and pd.CLASS_ID != ''">
 			and CLASS_ID = #{pd.CLASS_ID}
 		</if>
+		<if test="GRADE_ID != null and GRADE_ID != ''">
+			and GRADE_ID = #{pd.GRADE_ID}
+		</if>
+		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''">
+			and SCHOOL_ID = #{pd.SCHOOL_ID}
+		</if>
 		
 		<if test="pd.START_DATE != null and pd.START_DATE != ''"><!-- 关键词检索 -->
 			and (CREATE_DATE &gt; #{pd.START_DATE})
diff --git a/src/com/fh/bean/Paper.java b/src/com/fh/bean/Paper.java
index f3b12a1..94cf874 100644
--- a/src/com/fh/bean/Paper.java
+++ b/src/com/fh/bean/Paper.java
@@ -19,6 +19,16 @@ public class Paper {
 	private String user_id = "";
 	
 	private String class_id = "" ;
+	
+	private String school_id = "" ;
+
+	public String getSchool_id() {
+		return school_id;
+	}
+
+	public void setSchool_id(String school_id) {
+		this.school_id = school_id;
+	}
 
 	private List<Question> questions = new ArrayList<Question>();
 	
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index fc8a500..76fc4d2 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -494,7 +494,7 @@ public class V1 extends BaseController {
 		long cur = System.currentTimeMillis();
 		PageData pd = this.getPageData();
 		ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
-		if (pd.containsKey("PAPER_TYPE") && pd.containsKey("USER_ID")) {
+		if (pd.containsKey("PAPER_TYPE")) {
 			String CURRENTPAGE = pd.getString("CURRENTPAGE");
 			String SHOWCOUNT = pd.getString("SHOWCOUNT");
 			if (CURRENTPAGE != null && SHOWCOUNT != null
@@ -541,6 +541,7 @@ public class V1 extends BaseController {
 						paper.setSubject_id(ppd.getString("SUBJECT_ID"));
 						paper.setGrade_id(ppd.getString("GRADE_ID"));
 						paper.setScore(ppd.getString("SCORE"));
+						paper.setSchool_id(ppd.getString("SCHOOL_ID"));
 						paper.setQuestions(new ArrayList<Question>());
 
 						List<PageData> questList = v1Service
@@ -760,6 +761,7 @@ public class V1 extends BaseController {
 				+ (System.currentTimeMillis() - cur));
 		return res.toJson();
 	}
+	
 
 	/**
 	 * 试卷详细信息
@@ -1229,7 +1231,7 @@ public class V1 extends BaseController {
 			paperPd.put("PAPER_STATE", "0");
 			paperPd.put("REMARK", "");
 			String schoolID = Myelfun.getUserID(paper.getUser_id());
-			paperPd.put("SCHOOL_ID", schoolID);
+			paperPd.put("SCHOOL_ID", paper.getSchool_id() == null ? schoolID:paper.getSchool_id());
 			paperPd.put("CREATE_DATE", Tools.date2Str(new Date()));
 			paperPd.put("MODIFY_DATE", Tools.date2Str(new Date()));
 
diff --git a/src/com/fh/controller/sunvote/Myelfun.java b/src/com/fh/controller/sunvote/Myelfun.java
index e66906e..cf5c9be 100644
--- a/src/com/fh/controller/sunvote/Myelfun.java
+++ b/src/com/fh/controller/sunvote/Myelfun.java
@@ -158,7 +158,7 @@ public class Myelfun {
 		if(pageData != null){
 			return pageData.getString("NAME");
 		}else{
-			return "" ;
+			return "管理员" ;
 		}
 	}
 	
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index 7f2c9da..1380bca 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -248,21 +248,29 @@ public class PaperController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		String paperType = pd.getString("PAPER_TYPE") ;
 		Paper paper = new Paper();
 		paper.setTitle(pd.getString("NAME"));
 		paper.setExam_time(pd.getString("TIME"));
 		Session session = Jurisdiction.getSession();
 		User user = (User)session.getAttribute(Const.SESSION_USER);
 		paper.setUser_id(user.getUSER_ID());
-		paper.setPaper_type("1");
-		paper.setSubject_id(getSubjectId());
-		paper.setGrade_id(getGradeID());
+		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.setQuestions(new ArrayList<Question>());
+		
 		pd.put("JSON", paper.toJson());
 		logger.info(paper.toJson());
 		
 		mv.setViewName("sunvote/teacher/creat_question");
 		mv.addObject("pd", pd);
+		if(paperType != null && "2".equals(paperType)){
+			mv.addObject("JUMP_URL", "/main/admin");
+		}else{
+			mv.addObject("JUMP_URL", "/main/teacher");
+		}
 		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
 		return mv;
 	}
@@ -325,6 +333,114 @@ public class PaperController extends BaseController {
 		return mv;
 	}
 	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/list4")
+	public ModelAndView list4(Page page) throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String keywords = pd.getString("keywords");				//关键词检索条件
+		if(null != keywords && !"".equals(keywords)){
+			pd.put("keywords", keywords.trim());
+		}
+		pd.put("PAPER_TYPE","1");
+		page.setPd(pd);
+		List<PageData>	varList = paperService.list(page);	//列出Paper列表
+		pd.put("PAPER_TYPE","2");
+		List<PageData>	varList2 = paperService.list(page);	//列出Paper列表
+		varList.addAll(varList2);
+		mv.setViewName("sunvote/paper/paper_list4");
+		
+		for(PageData p:varList){
+			String examTime = p.getString("EXAM_TIME");
+			if(examTime != null){
+				try{
+					int et = Integer.parseInt(examTime);
+					String min = (et / 60 ) + "" ;
+					if(min.length() < 2){
+						min = "0" + min ;
+					}
+					String sec = (et % 60 ) + "" ;
+					if(sec.length() < 2){
+						sec = "0" + sec ;
+					}
+					if(et > 60){
+						examTime = min + ":" + sec; 
+					}else{
+						examTime = "00:" +  sec; 
+					}
+				}catch(Exception e){
+					e.printStackTrace();
+				}
+			}
+			if(examTime == null){
+				examTime = "00:00";
+			}
+			p.put("EXAM_TIME", examTime);
+		}
+		
+		mv.addObject("varList", varList);
+		mv.addObject("pd", pd);
+		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
+		return mv;
+	}
+	
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/list5")
+	public ModelAndView list5(Page page) throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String keywords = pd.getString("keywords");				//关键词检索条件
+		if(null != keywords && !"".equals(keywords)){
+			pd.put("keywords", keywords.trim());
+		}
+		pd.put("PAPER_TYPE","2");
+		pd.put("USER_ID", this.getUserID());
+		page.setPd(pd);
+		List<PageData>	varList = paperService.list(page);	//列出Paper列表
+		mv.setViewName("sunvote/paper/paper_list5");
+		
+		for(PageData p:varList){
+			String examTime = p.getString("EXAM_TIME");
+			if(examTime != null){
+				try{
+					int et = Integer.parseInt(examTime);
+					String min = (et / 60 ) + "" ;
+					if(min.length() < 2){
+						min = "0" + min ;
+					}
+					String sec = (et % 60 ) + "" ;
+					if(sec.length() < 2){
+						sec = "0" + sec ;
+					}
+					if(et > 60){
+						examTime = min + ":" + sec; 
+					}else{
+						examTime = "00:" +  sec; 
+					}
+				}catch(Exception e){
+					e.printStackTrace();
+				}
+			}
+			if(examTime == null){
+				examTime = "00:00";
+			}
+			p.put("EXAM_TIME", examTime);
+		}
+		
+		mv.addObject("varList", varList);
+		mv.addObject("pd", pd);
+		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
+		return mv;
+	}
 	
 	/**列表
 	 * @param page
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index a093a4f..4c82d8a 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -171,6 +171,25 @@ public class TeacherController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	
+	/**
+	 * 列表
+	 * 
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/teach_paper1")
+	public ModelAndView teach_paper1(Page page) throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "列表Paper");
+		String userId = this.getUserID();
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		mv.setViewName("sunvote/teacher/teach_paper1");
+		pd.put("userId", userId);
+		mv.addObject("pd", pd);
+		return mv;
+	}
 	/**
 	 * 列表
 	 * 
--
libgit2 0.21.4