From c617106f9779fc983efcef02d9021b12538569dd Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Tue, 21 Aug 2018 16:06:26 +0800
Subject: [PATCH] 添加即时测功能

---
 .settings/org.eclipse.core.resources.prefs                              |   3 +++
 WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp                  |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp                      | 316 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp                    | 501 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp                     | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp                    |  64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
 WebRoot/static/css/paper.css                                            |   5 +++++
 WebRoot/static/css/paper_view.css                                       |  23 +++++++++++++++++++++++
 WebRoot/static/css/set_quetion.css                                      |  52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/static/css/teach.css                                            |   8 ++++++--
 WebRoot/static/images/add.png                                           | Bin 0 -> 16068 bytes
 WebRoot/static/images/arrow_right.png                                   | Bin 0 -> 340 bytes
 WebRoot/static/images/checked.png                                       | Bin 0 -> 355 bytes
 WebRoot/static/images/down_arrow.png                                    | Bin 0 -> 391 bytes
 WebRoot/static/images/off.png                                           | Bin 0 -> 2461 bytes
 WebRoot/static/images/on.png                                            | Bin 0 -> 1055 bytes
 WebRoot/static/images/option_1.png                                      | Bin 0 -> 5955 bytes
 WebRoot/static/images/option_2.png                                      | Bin 0 -> 5931 bytes
 WebRoot/static/images/option_3.png                                      | Bin 0 -> 5915 bytes
 WebRoot/static/images/option_4.png                                      | Bin 0 -> 5847 bytes
 WebRoot/static/images/reduce.png                                        | Bin 0 -> 1097 bytes
 WebRoot/static/images/title.png                                         | Bin 0 -> 12963 bytes
 WebRoot/static/images/up_arrow.png                                      | Bin 0 -> 587 bytes
 WebRoot/static/js/model.js                                              |  14 ++++++++++++--
 resources/mybatis1/sunvote/ChapterMapper.xml                            |  14 +++++++-------
 resources/mybatis1/sunvote/KnowledgeMapper.xml                          |   2 ++
 resources/mybatis1/sunvote/PaperMapper.xml                              |   4 ++++
 resources/mybatis1/sunvote/QuestionMapper.xml                           |   3 +++
 resources/mybatis1/sunvote/TeachingMaterialMapper.xml                   |  27 ++++++++++++++-------------
 resources/mybatis1/sunvote/TestPaperInfoMapper.xml                      |  47 +++++++++++++++++++++++++++++++++++++++++++++++
 resources/mybatis1/sunvote/TextbookMapper.xml                           | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/Main.java                                                    |  81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/api/V1.java                                       | 376 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/com/fh/controller/base/BaseController.java                          |   9 +++++++++
 src/com/fh/controller/sunvote/paper/PaperController.java                |  58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/sunvote/teacher/TeacherController.java            | 396 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------
 src/com/fh/controller/system/login/LoginController.java                 |   7 +++++++
 src/com/fh/entity/system/User.java                                      |   9 +++++++++
 src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java      |  20 ++++++++++++++++++++
 src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java |  16 ++++++++++++++++
 src/com/fh/service/sunvote/textbook/TextbookManager.java                |  52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/service/sunvote/textbook/impl/TextbookService.java           |  78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 42 files changed, 2301 insertions(+), 166 deletions(-)
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
 create mode 100644 WebRoot/static/css/paper.css
 create mode 100644 WebRoot/static/css/paper_view.css
 create mode 100644 WebRoot/static/css/set_quetion.css
 create mode 100644 WebRoot/static/images/add.png
 create mode 100644 WebRoot/static/images/arrow_right.png
 create mode 100644 WebRoot/static/images/checked.png
 create mode 100644 WebRoot/static/images/down_arrow.png
 create mode 100644 WebRoot/static/images/off.png
 create mode 100644 WebRoot/static/images/on.png
 create mode 100644 WebRoot/static/images/option_1.png
 create mode 100644 WebRoot/static/images/option_2.png
 create mode 100644 WebRoot/static/images/option_3.png
 create mode 100644 WebRoot/static/images/option_4.png
 create mode 100644 WebRoot/static/images/reduce.png
 create mode 100644 WebRoot/static/images/title.png
 create mode 100644 WebRoot/static/images/up_arrow.png
 create mode 100644 resources/mybatis1/sunvote/TextbookMapper.xml
 create mode 100644 src/com/fh/Main.java
 create mode 100644 src/com/fh/service/sunvote/textbook/TextbookManager.java
 create mode 100644 src/com/fh/service/sunvote/textbook/impl/TextbookService.java

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 8746399..4fd46db 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 encoding//WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp=UTF-8
+encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp=UTF-8
+encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp=UTF-8
+encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/system/appuser/appuser_list.jsp=UTF-8
 encoding//WebRoot/WEB-INF/jsp/system/fhsms/fhsms_list.jsp=UTF-8
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
index 178f5d9..8885daa 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -190,7 +190,7 @@
 <script>
 	var testData = ${pd.JSON};
 	var URL = "<%=basePath%>api/v1/uploadpaper";
-	var JUMP_URL = "<%=basePath%>/main/teacher";
+	var JUMP_URL = "<%=basePath%>/main/teacher";  
 	if(testData.questions.length>0){
 		var title = testData.title;
 		if(title == null || title == ''){
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
new file mode 100644
index 0000000..f355c65
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
@@ -0,0 +1,316 @@
+<%@ 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 href="../static/css/teach.css" rel="stylesheet">
+	<link href="../static/css/paper_view.css" rel="stylesheet">
+
+    <!-- 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]-->
+	<style>
+		 .analysis table{display:inline-block;vertical-align:middle;}
+		 .resolve_box img{vertical-align:top;}
+	</style>
+  </head>
+  <body>
+  <div class="container">
+    <div class="page-header">
+	  <h3 class="col-md-6" id="paper_title"></h3>
+	   <h3 class="col-md-6">考试时长：<span id="time"></span>分钟</h3>
+		<div class="clearfix"></div>
+	</div>
+	<div class="content_report">
+		<div class="col-md-3 left_menu">
+			<ul>
+				<li class="active">学生完成情况</li>
+				<li>题目分析</li>
+			</ul>
+		</div>
+		<div class="col-md-9 report">
+			<div class="report_info">
+				<ul>
+					<li>未完成学生 1/1</li>
+					<li>平均错题数 0</li>
+					<li>正确率 0%</li>
+					<li>平均用时 0秒</li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
+			<div class="table_box">
+				<table class="table table-striped">
+				  <thead>
+					<tr>
+						<th>姓名</th>
+						<th>答题时间</th>
+						<th>答对数</th>
+						<th>答错数</th>
+						<th>错题详情</th>
+						<th>一键催交</th>
+					</tr>
+				  </thead>
+				  <tbody>
+					<tr>
+						<td>杨大辉</td>
+						<td>未完成</td>
+						<td>--</td>
+						<td>--</td>
+						<td>--</td>
+						<td>催作业</td>
+					</tr>
+					<tr>
+						<td>何禾</td>
+						<td>2018/6/21</td>
+						<td>--</td>
+						<td>--</td>
+						<td>--</td>
+						<td>催作业</td>
+					</tr>
+				  </tbody>
+				</table>
+			</div>
+		</div>
+		<div class="col-md-9 analysis" style="display:none;">
+			<ul>
+				<li>
+					<div class="stem">
+						<p>1.如图，检测4个足球，其中超过标准质量的克数记为正数，不足标准质量的克数记为负数．从轻重的角度看，最接近标准的是（　　）</p>
+					</div>
+					<div class="option">
+						<ul>
+							<li><span>A.</span><img src="images/option_1.png" /></li>
+							<li><span>B.</span><img src="images/option_2.png" /></li>
+							<li><span>C.</span><img src="images/option_3.png" /></li>
+							<li><span>D.</span><img src="images/option_4.png" /></li>
+						</ul>
+						<div class="clearfix"></div>
+					</div>
+					<div class="resolve">
+					<div class="resolve_box">
+						<p>【答案】 A</p>
+						<p>【解析】由图数一数，可知总共有7位小同学，其中扎小辫的女孩有2人，男孩有5人。
+						故选A。</p>
+
+						<p>【考点】 10以内数的认识</p>
+					</div>
+					<div class="clearfix"></div>
+					<div class="tab_report_box">
+						<div class="col-md-3">
+							<p>答错人数</p>
+							<div class="round_w_orange">
+								<div class="round_n_orange">
+									<span>0/0</span>
+								</div>
+							</div>
+						</div>
+						<div class="col-md-3">
+							<p>错误率</p>
+							<div class="round_w_red">
+								<div class="round_n_red">
+									<span>100%</span>
+								</div>
+							</div>
+						</div>
+						<div class="col-md-6">
+						<div id="main" style="width:250px;height:140px;"></div>
+						</div>
+						<div class="clearfix"></div>
+					</div>
+					</div>
+
+					<div class="star_box">
+						<div class="col-md-6">错误学生：0/0</div>
+						<div class="col-md-6">
+							<div class="star">
+								<span style="float:left;">难度</span>
+								<ul>
+									<li class="on"></li>
+									<li class="on"></li>
+									<li class="off"></li>
+									<li class="off"></li>
+									<li class="off"></li>
+								</ul>
+							</div>
+							<div class="resolve_click">
+								<a  onclick="slide($(this))">查看解析</a>
+							</div>
+						</div>
+						<div class="clearfix"></div>
+					</div>
+				</li>
+			</ul>
+		</div>
+	</div>
+
+	</div>
+	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script src="js/echars.js"></script>
+	<script>
+	var url="http://127.0.0.1:8080/SunvoteEducation/"
+	function slide(obj){                      //查看解析
+		obj.closest(".star_box").siblings(".resolve").slideToggle(function(){
+			if($(".resolve").css("display") == "none")
+				obj.text("查看解析");
+			else
+				obj.text("收起解析");
+		});
+	}
+		$(".left_menu li").click(function(){
+			if($(this).index()==0){
+				$(this).siblings().removeClass("active");
+				$(this).addClass("active");
+				$(".analysis").css("display","none");
+				$(".report").css("display","block");
+			}else if($(this).index()==1){
+				$(this).siblings().removeClass("active");
+				$(this).addClass("active");
+				$(".report").css("display","none");
+				$(".analysis").css("display","block");
+			}
+		})
+		
+	function bar(index){
+		var myChart = echarts.init(document.getElementById('main'+index));
+		myChart.setOption({
+			color: ['#3398DB'],
+			tooltip : {
+				trigger: 'axis',
+				axisPointer : {            // 坐标轴指示器，坐标轴触发有效
+					type : 'line'        // 默认为直线，可选为：'line' | 'shadow'
+				}
+			},
+			grid: {
+				top: 15,
+				left: '0%',
+				right: '0%',
+				bottom: '0%',
+				containLabel: true
+			},
+			xAxis : [
+				{
+					type : 'category',
+					data : ['A', 'B', 'C', 'D'],
+					axisTick: {
+						alignWithLabel: true
+					},
+					axisLabel: {
+						show:true,
+						textStyle:{
+							 color: function (value){
+								console.log(value);
+								return value == "C" ? '#75b3ff' : '#fcb35b';
+							}
+						}
+					}
+				}
+
+
+			],
+			yAxis : [
+				{
+					type : 'value'
+				}
+			],
+			series : [
+				{
+					name:'直接访问',
+					type:'bar',
+					barWidth: '60%',
+					data:[10, 0, 20, 5],
+					itemStyle: {
+						//通常情况下：
+						normal:{
+							//每个柱子的颜色即为colorList数组里的每一项，如果柱子数目多于colorList的长度，则柱子颜色循环使用该数组
+							color: function (params){
+								var colorList = ['#fcb35b','#fcb35b','#75b3ff','#fcb35b'];
+								return colorList[params.dataIndex];
+							},
+							label : {show: true,position:'top',distance:-4}
+						}
+					}
+				}
+			]
+		});							
+	}
+		
+function getQueryString(name) {
+	  var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+	  var r = window.location.search.substr(1).match(reg);
+	  if (r != null) return unescape(r[2]); return null;
+  	}
+	var PAPER_ID=getQueryString("PAPER_ID");
+	var _html="";
+	$(document).ready(function(){
+		$.ajax({
+			url:url+"/api/v1/paperinfo",
+			async:false,
+			type:"post",
+			data:{PAPER_ID:PAPER_ID},
+			success:function(data){
+				console.log(data);
+				$("#paper_title").html(data.data.title);
+				$("#time").html(data.data.exam_time);
+				if(data.data.questions.length>0){				
+					for(var i=0;i<data.data.questions.length;i++){
+						_html += '<li><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【答案】 '+data.data.questions[i].answer+'</p><p><span>【解析】</span>'+data.data.questions[i].analysis+'</p></div><div class="clearfix"></div><div class="tab_report_box"><div class="col-md-3"><p>答错人数</p><div class="round_w_orange"><div class="round_n_orange"><span>0/0</span></div></div></div><div class="col-md-3"><p>错误率</p><div class="round_w_red"><div class="round_n_red"><span>100%</span></div></div></div><div class="col-md-6"><div id="main'+i+'" style="width:250px;height:140px;"></div></div><div class="clearfix"></div></div></div><div class="star_box"><div class="col-md-6">错误学生：0/0</div><div class="col-md-6"><div class="star"><span style="float:left;">难度</span></div><div class="resolve_click"><a  onclick="slide($(this))">查看解析</a></div></div><div class="clearfix"></div></div></li>';
+					}
+					console.log(_html);
+					$(".analysis ul").html(_html);
+					for(var j=0;j<data.data.questions.length;j++){
+						var option_html="";
+						$(".analysis li .stem").eq(j).append('<span>'+(j+1)+'、</span>'+data.data.questions[j].content);
+						var arry_option=data.data.questions[j].option_content;
+						arry_option=arry_option.replace("[","");
+						arry_option=arry_option.replace("]","");
+						arry_option=arry_option.split(",");
+						for(var x=0;x<arry_option.length;x++){
+							option_html += '<li><span>'+String.fromCharCode(64 + parseInt(x+1))+'.</span>'+arry_option[x]+'</li>';
+						}
+						$(".option").eq(j).find("ul").html(option_html);
+						
+						star(j,parseInt(data.data.questions[j].difficulty));
+						bar(j);
+					}
+				}
+			}
+		})
+	})
+	function star(index,num){                //难度星级
+			$(".star").eq(index).append('<ul></ul>');
+			var li_html="";
+			for(var i=1;i<=num;i++){
+				li_html +='<li class="on"></li>';
+			}
+			for(var j=num;j<5;j++){
+				li_html += '<li class="off"></li>';
+			}
+			
+			$(".star").eq(index).find("ul").html(li_html);
+		}
+	</script>
+	
+<!-- 	<li><div class="stem"></div><div class="option"><ul></ul><div class="clearfix"></div></div><div class="resolve"><div class="resolve_box"><p>【答案】 A</p><p>【解析】</p></div><div class="clearfix"></div><div class="tab_report_box"><div class="col-md-3"><p>答错人数</p><div class="round_w_orange"><div class="round_n_orange"><span>0/0</span></div></div></div><div class="col-md-3"><p>错误率</p><div class="round_w_red"><div class="round_n_red"><span>100%</span></div></div></div><div class="col-md-6"><div id="main" style="width:250px;height:140px;"></div></div><div class="clearfix"></div></div></div><div class="star_box"><div class="col-md-6">错误学生：0/0</div><div class="col-md-6"><div class="star"><span style="float:left;">难度</span></div><div class="resolve_click"><a  onclick="slide($(this))">查看解析</a></div></div><div class="clearfix"></div></div></li> -->
+	
+</html>
+
+
+
+
+
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
new file mode 100644
index 0000000..d137c35
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
@@ -0,0 +1,501 @@
+<!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 href="../static/css/teach.css" rel="stylesheet">
+	<link href="../static/css/set_quetion.css" rel="stylesheet">
+
+    <!-- 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]-->
+	<style>
+		table{display:inline-block;vertical-align: middle;}
+		.resolve_box img{vertical-align:top;}
+	</style>
+  </head>
+  <body>
+  <div class="container">
+    <div class="choose_class">
+		<div class="col-md-2">
+			<p>选择班级</p>
+		</div>
+		<div class="col-md-10">
+			<ul>
+				<li>一年级1502班</li>
+			</ul>
+		</div>
+		<div class="clearfix"></div>
+	</div>
+	<div class="col-md-3 left_menu">
+		<div class="tab">
+			<ul>
+				<li class="active" data-index=0><p>同步教材</p></li>
+				<li data-index=1><p>知识点</p></li>
+				<div class="clearfix"></div>
+			</ul>
+		</div>
+		<div class="choose_book">
+			<div class="book"><p><span>西师大版/一年级上</span></p><img src="../static/images/down_arrow.png" /><div class="clearfix"></div></div>
+			<div class="book_box">
+				<ul>
+					<li>
+						<p>人教版</p>
+						<img src="../static/images/arrow_right.png" />
+						<div class="clearfix"></div>		
+						<div class="float_box">
+							<ul>
+								<li>一年级1502班</li>
+								<li>一年级1502班</li>
+								<li>一年级1502班</li>
+								<li>一年级1502班</li>
+								<li>一年级1502班</li>
+								<div class="clearfix"></div>
+							</ul>
+						</div>
+					</li>
+					<li>
+						<p>人教版</p>
+						<img src="../static/images/arrow_right.png" />
+						<div class="clearfix"></div>	
+					</li>
+					<li>
+						<p>人教版</p>
+						<img src="../static/images/arrow_right.png" />
+						<div class="clearfix"></div>						
+					</li>
+					<li>
+						<p>人教版</p>
+						<img src="../static/images/arrow_right.png" />
+						<div class="clearfix"></div>						
+					</li>
+					<li>
+						<p>人教版</p>
+						<img src="../static/images/arrow_right.png" />
+						<div class="clearfix"></div>						
+					</li>
+					<li>
+						<p>人教版</p>
+						<img src="../static/images/arrow_right.png" />
+						<div class="clearfix"></div>						
+					</li><li>
+						<p>人教版</p>
+						<img src="../static/images/arrow_right.png" />
+						<div class="clearfix"></div>						
+					</li>
+					<li>
+						<p>人教版</p>
+						<img src="../static/images/arrow_right.png" />
+						<div class="clearfix"></div>		
+						<div class="float_box">
+							<ul>
+								<li>一年级1502班</li>
+								<li>一年级1502班</li>
+								<li>一年级1502班</li>
+								<li>一年级1502班</li>
+								<li>一年级1502班</li>
+								<div class="clearfix"></div>
+							</ul>
+						</div>
+					</li>
+				</ul>
+				
+			</div>
+			<!-- <div class="gary"></div> -->
+		</div>
+		<div class="section">
+			<ul>
+				<!-- <li>
+					<img src="../static/images/add.png" /><span>1 准备课</span>
+					<ul>
+						<li>
+							<span>●</span>
+							<span>1.1 数一数</span>
+						</li>
+						<li>
+							<span>●</span>
+							<span>1.1 数一数</span>
+						</li>
+					</ul>
+				</li>
+				<li><img src="../static/images/reduce.png" />期中</li> -->
+			</ul>
+		</div>
+	</div>
+	<div class="col-md-9 right_content">
+		<!-- <div class="screen">
+			<div class="tag">
+				<dl>
+					<dt>题目难度：</dt>
+					<dd>基础题</dd>
+					<dd>中档题</dd>
+					<dd>难题</dd>
+				</dl>
+			</div>
+			<div class="tag">
+				<dl>
+					<dt>题目来源：</dt>
+					<dd>云题库</dd>
+					<dd>个人题库</dd>
+				</dl>
+			</div>
+		</div> -->
+		<div class="question_box">
+			<ul>
+				<!-- <li>
+					<div class="content">
+					<span>1、</span>
+						<img  src="http://image.yuncelian.com/1/2018/1/2a5074aa7d5f0dc7df586005922cb60d.png" style="vertical-align:middle;FLOAT:right" />如图，▱ABCD的对角线AC、BD交于点O，AE平分∠BAD交BC于点E，且∠ADC=60°，AB=<span class="YclQues" mathtag="math" style="whiteSpace:nowrap;wordSpacing:normal;wordWrap:normal"><table cellpadding="-1" cellspacing="-1" style="margin-right:1px"><tr><td style="border-bottom:1px solid black">1</td></tr><tr><td>2</td></tr></table></span>BC，连接OE．下列结论：①∠CAD=30°；②S<SUB>▱ABCD</SUB>=AB•AC；③OB=AB；④OE=<span class="YclQues" mathtag="math" style="whiteSpace:nowrap;wordSpacing:normal;wordWrap:normal"><table cellpadding="-1" cellspacing="-1" style="margin-right:1px"><tr><td style="border-bottom:1px solid black">1</td></tr><tr><td>4</td></tr></table></span>BC，成立的个数有（　　）
+					</div>
+					<div class="option">
+						<ul>
+							<li><span>A.</span>1个</li>
+							<li><span>B.</span>2个</li>
+							<li><span>C.</span>3个</li>
+							<li><span>D.</span>4个</li>
+							<div class="clearfix"></div>
+						</ul>
+					</div>
+					<div class="resolve">
+					<div class="resolve_box">
+						<p><span>【答案】</span> A</p>
+						<p><span>【解析】</span><img src="http://image.yuncelian.com/1/analysis/00ca500f-224f-584e-b92f-d7863238e2a8.png"></p>
+
+						<p>【考点】 10以内数的认识</p>
+					</div>
+					<div class="clearfix"></div>
+					</div>
+					<div class="star_box">
+						<div class="col-md-6">
+							<div class="star">
+								<span style="float:left;">难度</span>
+								<ul data-num="4">
+									<li class="on"></li>
+									<li class="on"></li>
+									<li class="off"></li>
+									<li class="off"></li>
+									<li class="off"></li>
+								</ul>
+							</div>
+							<div class="resolve_click">
+								<a  onclick="slide($(this))">查看解析</a>
+								<div class="check_box"></div>
+							</div>
+							
+								
+							
+						</div>
+						<div class="clearfix"></div>
+					</div>
+				</li> -->
+				
+			</ul>
+		</div>
+	</div>
+	</div>
+	<div class="basket">
+		<div class="basket_box">
+			<p class="col-md-4">已选：<span id="all_que_num">0</span>题</p>
+			<p class="col-md-8"><input type="button" value="清空"  class="btn btn-danger clear_que"/><button type="button" class="btn btn-primary btn-lg topic" >
+  完成选题
+</button></p>
+		</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="form-group">
+				<label for="inputEmail3" class="col-sm-2 control-label">试卷标题</label>
+				<div class="col-sm-10">
+				  <input type="text" class="form-control" id="title" placeholder="例：初二数学">
+				</div>
+			  </div>
+			  <div class="form-group">
+				<label for="inputPassword3" class="col-sm-2 control-label">考试时长</label>
+				<div class="col-sm-10">
+				  <input type="text" class="form-control" id="time" placeholder="例：120分钟">
+				</div>
+			  </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">确定</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>
+	//http://192.168.0.113:8080/SunvoteEducation/api/v1/point  所有知识点
+	var url="http://127.0.0.1:8080";
+	var temp_tag;
+	var temp_data;
+	
+	$(document).ready(function(){
+		getChapter();
+		getTeachingMaterial();
+	});
+	function getPoint(){             //获取知识点
+		$.ajax({
+			url:url+"/SunvoteEducation/api/v1/point",
+			async:false,
+			type:"post",
+			data:{depth:"",subject_id:20,p_id:"",knowledge_from:101},
+			success:function(data){
+				console.log(data);
+				var point_html="";
+				for(var i=0;i<data.data.length;i++){
+					point_html +='<li data-id="'+data.data[i].KNOWLEDGE_ID+'" data-click=0><img src="../static/images/add.png" /><span>'+(i+1)+data.data[i].NAME+'</span></li>';
+				}
+				$(".section").children("ul").html(point_html);
+			}
+		})
+	}
+	function getChapter(){                 //获取章节
+		$(".section").children("ul").html("");
+		$.ajax({
+			url:url+"/SunvoteEducation/api/v1/chapter",
+			async:false,
+			type:"post",
+			data:{TEACHINGMATERIAL_ID:"14f2ad40-d4d6-4558-af5b-c9e3703c1ee8"},
+			success:function(data){
+				console.log(data);
+				for(var i=0;i<data.data.length;i++){
+					$(".section").children("ul").append('<li data-id="'+data.data[i].ID+'" data-click=0><img src="../static/images/add.png" /><span>'+data.data[i].NAME+'</span></li>');	
+					if(data.data[i].CHILDREN.length>0){
+						$(".section").children("ul").children("li").eq(i).append("<ul></ul>");
+						for(var j=0;j<data.data[i].CHILDREN.length;j++){
+							$(".section").children("ul").children("li").eq(i).children("ul").append('<li data-id="'+data.data[i].CHILDREN[j].ID+'" onclick="getQuestion($(this))"><span>●</span><span>'+data.data[i].CHILDREN[j].NAME+'</span></li>');
+						}
+					}
+				}
+				
+			}
+		})
+	}
+	function getMenu(id,obj){        //获取知识点下级内容
+		var _html="";
+		$.ajax({
+			url:url+"/SunvoteEducation/api/v1/point",
+			async:false,			
+			type:"post",
+			data:{depth:"",subject_id:20,p_id:id,knowledge_from:101},
+			success:function(data){
+				console.log(data);
+				obj.append('<ul></ul>');
+				for(var i=0;i<data.data.length;i++){
+				console.log(typeof(data.data[i].CHILDREN));
+				if(data.data[i].CHILDREN===undefined)
+					_html +='<li data-id="'+data.data[i].KNOWLEDGE_ID+'" data-click=0 onclick="getQuestion($(this))"><span>●</span><span>'+(i+1)+data.data[i].NAME+'</span></li>';
+				else
+					_html +='<li data-id="'+data.data[i].KNOWLEDGE_ID+'" data-click=0><img src="../static/images/add.png" /><span>'+(i+1)+data.data[i].NAME+'</span></li>';
+				}
+				obj.children('ul').html(_html);
+			}
+		})
+	}
+	function slide(obj){                      //查看解析
+		obj.closest(".star_box").siblings(".resolve").slideToggle(function(){
+			if($(".resolve").css("display") == "none")
+				obj.text("查看解析");
+			else
+				obj.text("收起解析");
+		});
+
+		}
+	function getQuestion(obj){                //获取题目
+		var knowledge_id="",chapter_id="";
+		if($(".tab .active").attr("data-index")==1){
+			knowledge_id=obj.attr("data-id");
+		}else{
+			chapter_id=obj.attr("data-id");
+		}
+		
+		var _html="";
+		
+		$.ajax({
+			url:url+"/SunvoteEducation/api/v1/questions",
+			async:false,
+			type:"post",
+			data:{chapter_id:chapter_id,teachingmaterial_id:"",knowledge_id:knowledge_id,question_from:101,user_id:"",problem_type:"",subject_id:"",count:""},
+			success:function(data){
+			console.log(data);
+			if(data.data.length>0){
+				for(var i=0;i<data.data.length;i++){
+					_html += '<li data-id="'+data.data[i].QUESTION_ID+'"><div class="content"></div><div class="option"><ul></ul></div><div class="resolve"><div class="resolve_box"><p><span>【答案】</span> '+data.data[i].ANSWER+'</p><p><span>【解析】</span>'+data.data[i].ANALYSIS+'</p></div></div><div class="star_box"><div class="col-md-6"><div class="star"><span style="float:left;">难度</span></div><div class="resolve_click"><a  onclick="slide($(this))">查看解析</a><div class="check_box"></div></div></div><div class="clearfix"></div></div></li>';
+				}
+				$(".question_box ul").html(_html);
+				for(var j=0;j<data.data.length;j++){
+					var option_html="";
+					$(".question_box li .content").eq(j).append('<span>'+(j+1)+'、</span>'+data.data[j].CONTENT);
+					var arry_option=data.data[j].OPTION_CONTENT;
+					arry_option=arry_option.replace("[","");
+					arry_option=arry_option.replace("]","");
+					arry_option=arry_option.split(",");
+					for(var x=0;x<arry_option.length;x++){
+						option_html += '<li><span>'+String.fromCharCode(64 + parseInt(x+1))+'.</span>'+arry_option[x]+'</li>';
+					}
+					$(".option").eq(j).find("ul").html(option_html);
+					
+					star(j,parseInt(data.data[j].DIFFICULTY));
+					
+				}
+			}
+			}
+		})
+	}
+	function getTeachingMaterial(){             //获取教材版本
+		$.ajax({
+			url:url+"/SunvoteEducation/api/v1/teachingmaterial",
+			async:false,
+			type:"post",
+			data:{subject_id:20},
+			success:function(data){
+				console.log(data);
+				if(data.data.length>0){
+					var teach_html="";
+					for(var i=0;i<data.data.length;i++){
+						teach_html += '<li data-id="'+data.data[i].ID+'"><p>'+data.data[i].NAME+'</p><img src="../static/images/arrow_right.png" /><div class="clearfix"></div></li>';
+					}
+					$(".book_box ul").html(teach_html);
+				}
+				
+			}	
+		})
+	}
+	function star(index,num){                //难度星级
+		$(".star").eq(index).append('<ul></ul>');
+		var li_html="";
+		for(var i=1;i<=num;i++){
+			li_html +='<li class="on"></li>';
+		}
+		for(var j=num;j<5;j++){
+			li_html += '<li class="off"></li>';
+		}
+		
+		$(".star").eq(index).find("ul").html(li_html);
+	}
+	
+		$(".section").on("click","li",function(event){
+			event.stopPropagation();
+			var that=$(this);
+			
+			//console.log(that.attr("data-click"));
+			if($(".tab .active").attr("data-index")==1){
+				if(that.attr("data-click")==0)
+					getMenu(that.attr("data-id"),that);
+				that.attr("data-click",1);
+			}
+			
+			if(that.children('ul').length>0)
+				that.children('ul').slideToggle(function(){
+					if(that.children('ul').css("display")=="block")
+						that.children('img').attr("src","../static/images/reduce.png");
+					else
+						that.children('img').attr("src","../static/images/add.png");
+				});
+		});
+		$(".book_box").children("ul").on("mouseover","li",function(event){    //教材版本交互
+			event.stopPropagation();
+			$(this).siblings().css("background","#fff");
+			$(this).css("background","#e9f0ff");
+			//$(".float_box").css("display","none");
+			$(this).children(".float_box").css("display","block");
+		});
+		$(".book_box").children("ul").on("mouseleave","li",function(event){  //教材版本交互
+			event.stopPropagation();
+			$(this).css("background","#fff");
+			//$(this).children(".float_box").css("display","none");
+		});
+		$(".float_box").on("mouseleave",function(event){                //教材版本交互
+			event.stopPropagation();
+			$(this).css("display","none");
+		});
+		$(".book").click(function(){                                //教材版本下拉框交互
+			$(".book_box").slideToggle();
+		})
+		$(document).on("click",".check_box",function(){    //选中题目
+			if($(this).hasClass("checked")){
+				$(this).removeClass("checked");
+			}else{
+				$(this).addClass("checked");
+			}
+			$("#all_que_num").html($(".checked").length);
+		});
+		$(".clear_que").click(function(){                 //清空
+			$(".checked").removeClass("checked");
+			$("#all_que_num").html($(".checked").length);
+		});
+		$(".tab li").click(function(){                     //教材与知识点选择
+			$(this).siblings().removeClass("active");
+			$(this).addClass("active");
+			if($(this).index()==0){
+				$(".choose_book").css("display","block");
+				getChapter();
+			}else{
+				$(".choose_book").css("display","none");
+				getPoint();
+			}
+		});
+		$(".topic").click(function(){
+			if(parseInt($("#all_que_num").text())>0)
+				$('#myModal').modal('show');
+			else
+				alert("请先选择题目")
+		});
+		$("#submit").click(function(){
+			var question_arry=[];
+			for(var i=0;i<$(".checked").length;i++){
+				question_arry[i]={
+						score: "0",
+						part_score: "0",
+						question_id: $(".checked").eq(i).closest("li").attr("data-id"),
+						rank: i.toString(),
+						no_name: i.toString()
+					};
+				
+			}
+			var data={
+				title: $("#title").val(),
+				exam_time: $("#time").val(),
+				paper_type: "101",
+				subject_id: "20",
+				grade_id: "",
+				class_id: "30378682ca9c4c648118afe55569aa97",
+				user_id: "8dbef15bb6d043ec94b719ede583b033",
+				score: "100",
+				questions: question_arry
+			};
+			//console.log(data);
+			$.ajax({
+			url:url+"/SunvoteEducation/api/v1/publishpaper",
+			async:false,
+			type:"post",
+			dataType: "json",
+			headers: {'Content-Type': 'application/json'},
+			data:JSON.stringify(data),
+			success:function(data){
+				alert("上传成功");
+				$('#myModal').modal('hide');
+			}
+		})	
+			
+		})
+	</script>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
new file mode 100644
index 0000000..9308851
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
@@ -0,0 +1,153 @@
+<%@ 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 href="../static/css/teach.css" rel="stylesheet">
+	<link href="../static/css/paper.css" rel="stylesheet">
+  </head>
+  <body>
+  <div class="container">
+    <div class="page-header">
+	  <h3 class="col-md-6">布置练习</h3>
+	    <a href="set_question" class="btn btn-info">出题</a>
+		<div class="clearfix"></div>
+	</div>
+	<div class="choose_class">
+		<div class="col-md-2"><h4>选择班级</h4></div>
+		<div class="col-md-10">
+			<ul>
+				<li>一年级1501班</li>
+				<li class="active">一年级1502班</li>
+				<li>一年级1503班</li>
+				<li>一年级1504班</li>
+				<li>一年级1505班</li>
+			</ul>
+		</div>
+		<div class="clearfix"></div>
+	</div>
+	<div class="screen">
+		<div class="col-md-2">按条件筛选</div>
+		<div class="col-md-10">
+			<ul>
+				<li>
+					<div class="form-group">
+					   <div class="col-sm-3">
+						 <select name="dealer_id_1" id="dealer_id_1" class="selectpicker show-tick form-control"  data-width="98%" data-first-option="false" title='请选择经销商(必选)' required data-live-search="true">
+							<option value="0">现在</option>
+							<option value="0">6月</option>
+							<option value="0">7月</option>
+						 </select>
+					   </div>
+					</div>
+				</li>
+				<li>
+					<div class="form-group">
+					   <div class="col-sm-3">
+						 <select name="dealer_id_2" id="dealer_id_2" class="selectpicker show-tick form-control"  data-width="98%" data-first-option="false" title='请选择经销商(必选)' required data-live-search="true">
+							<option value="0">初一1501班</option>
+							<option value="0">初一1502班</option>
+							<option value="0">初一1503班</option>
+							<option value="0">初一1504班</option>
+							<option value="0">初一1505班</option>
+						 </select>
+					   </div>
+					</div>
+				</li>
+				<li>
+					<button type="button" class="btn btn-info">搜索</button>
+				</li>
+			</ul>
+		</div>
+		<div class="clearfix"></div>
+	</div>
+	<div class="result">
+		<table class="table table-striped">
+		  <thead>
+			<tr>
+				<th>序号</th>
+				<th>创建时间</th>
+				<th>班级</th>
+				<th>科目</th>
+				<th>完成情况</th>
+				<th>试卷名称</th>
+				<th>考试时长</th>
+				<th>状态</th>
+				<th>查看</th>
+			</tr>
+		  </thead>
+		  <tbody id="tab_body">
+			<tr>
+				<td>1</td>
+				<td>2018/7/31</td>
+				<td>一年级1502班</td>
+				<td>小学数学</td>
+				<td>0/2</td>
+				<td>数一数</td>
+				<td>2018/08/05 08:00</td>
+				<td>已截止</td>
+				<td>查看</td>
+			</tr>
+			<tr>
+				<td>2</td>
+				<td>2018/6/21</td>
+				<td>一年级1502班</td>
+				<td>小学数学</td>
+				<td>0/2</td>
+				<td>1.1 认识平面图形</td>
+				<td>2018/06/24 08:00</td>
+				<td>已截止</td>
+				<td>查看</td>
+			</tr>
+		  </tbody>
+		</table>
+	</div>
+	</div>
+	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
+	<script>
+		var url="http://127.0.0.1:8080/SunvoteEducation";
+		var tab_html="";
+		var user_id= "8dbef15bb6d043ec94b719ede583b033",
+			subject_id="",
+			class_id="";
+		$(document).ready(function(){
+			$.ajax({
+				url:url+"/api/v1/paper",
+				async:false,
+				type:"post",
+				data:{
+					paper_type:"101",
+					user_id:user_id,
+					subject_id:subject_id,
+					class_id:class_id,
+					currentpage:"",
+					showcount:"10"
+				},
+				success:function(data){
+					for(var i=0;i<data.data.length;i++){
+						tab_html += '<tr><td>'+(i+1)+'</td><td>'+data.data[i].CREATE_DATE+'</td><td>一年级1502班</td><td>小学数学</td><td>0/2</td><td>'+data.data[i].TITLE+'</td><td>'+data.data[i].EXAM_TIME+'分钟</td><td>已截止</td><td><a onclick="jump($(this));" data-id="'+data.data[i].PAPER_ID+'" >查看</a></td></tr>'
+					}
+					$("#tab_body").html(tab_html);
+				}
+			})
+		})
+		function jump(obj){
+			var id=obj.attr("data-id");
+			location.href="paper_view.do?PAPER_ID="+id;
+		}
+		
+	</script>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 73aea1a..5a509e9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -56,29 +56,65 @@
 				<p>
 					班级管理<span class="right jiao"></span>
 				</p>
-				<ul>
+				<ul class="menu_1">
 					<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-						<li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')">${var.GRADE_NAME}${var.SUBJECT_NAME}
-								<span>${var.CLASS_NAME}</span>
+						<li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.GRADE_NAME}${var.SUBJECT_NAME}
+								<span>${var.CLASS_NAME}</span></p>
 						</li>
 			</c:forEach>
 
 			</ul>
 		</div>
 		<div class="testpaper tab1">
-			<p>
-				试卷管理<span class="right jiao"></span>
-			</p>
+			<p>试卷管理<span class="right jiao"></span></p>
+				<ul class="menu_1">
+					<li >
+						<p id="qingsongkao_paper">轻松考试卷管理</p>
+						<!-- <ul class="menu_2">
+							<li><p>高一数学 202班</p></li>
+							<li><p>高一数学 203班</p></li>
+						</ul> -->
+					</li>
+					<li>
+						<p id="jishice_paper">即时测试卷管理</p>
+						
+						<!-- <ul class="menu_2">
+							<li><p>高一数学 202班</p></li>
+							<li><p>高一数学 203班</p></li>
+						</ul> -->
+					</li>
+				</ul>
+			
 		</div>
 		<div class="analyse tab1">
 			<p>
 				测验分析<span class="right jiao"></span>
 			</p>
-			<ul>
+			
+			<ul class="menu_1">
+					<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>
+						</ul>
+					</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>
+						</ul>
+					</li>
+				</ul>
+			
+		<%-- 	<ul class="menu_1">
 			<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-				<li onclick="event.stopPropagation();report('${var.CLASS_ID}')">${var.CLASS_NAME} 成绩</li>
+				<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
 			</c:forEach>
-			</ul>
+			</ul> --%>
 		</div>
 	</div>
 	<div class="content_r">
@@ -156,7 +192,7 @@
 			}
 		});
 		
-		$(".testpaper").click(function (){
+		$("#qingsongkao_paper").click(function (){
 			var path = "../paper/list2.do?" ;
 			//$(".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)){
@@ -164,6 +200,14 @@
 				window.top.loading.show();
 			}
 		});
+		
+		$("#jishice_paper").click(function (){
+			var path = "../teacher/teach_paper.do?" ;
+			//if($("#mainFrame").attr('src') != (path)){
+				$("#mainFrame").attr('src',path);
+				//window.top.loading.show();
+			//}
+		});
 	</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/WebRoot/static/css/paper.css b/WebRoot/static/css/paper.css
new file mode 100644
index 0000000..4b6a1f7
--- /dev/null
+++ b/WebRoot/static/css/paper.css
@@ -0,0 +1,5 @@
+li{list-style:none;}
+.choose_class{border-bottom:1px solid #eee;padding:2% 0 5% 0;}
+.choose_class li{width:20%;margin:0 2.5%;margin-top:2%;float:left;border:1px solid #3c7ae3;text-align:center;border-radius:3px;line-height:50px;font-size:16px;}
+.choose_class li.active{color:#fff;background:#3c7ae3;}
+.screen{border-bottom:1px dashed #eee;padding:3% 0;}
\ No newline at end of file
diff --git a/WebRoot/static/css/paper_view.css b/WebRoot/static/css/paper_view.css
new file mode 100644
index 0000000..d1f280c
--- /dev/null
+++ b/WebRoot/static/css/paper_view.css
@@ -0,0 +1,23 @@
+li{list-style:none;}
+.left_menu li{line-height:50px;border-bottom:1px solid #ccc;text-align:center;}
+.left_menu .active{background:#6691de;color:#fff;}
+.report_info{padding-bottom:30px;border-bottom:1px solid #ccc;}
+.report_info li{width:20%;float:left;margin:0 2.5%;line-height:50px;background:#e7effd;text-align:center;border-radius:25px;}
+.option{padding-bottom:20px;}
+.option li{width:100%;}
+.option li span{vertical-align:middle;margin-right:5px;}
+.resolve_box{padding:20px 0;border-top:1px dashed #ccc;}
+.star_box{border-top:1px dashed #ccc;border-bottom:1px solid #ccc;padding:10px 0;}
+.star li{width:16px;height:16px;float:left;margin-left:5px;}
+.star ul{float:left;padding-left:0;margin-right:20px;}
+.star .off{background:url(../images/off.png) no-repeat;background-size:100%;}
+.star .on{background:url(../images/on.png) no-repeat;background-size:100%;}
+.tab_report_box{padding:20px 0;border-top:1px dashed #ccc;}
+.tab_report_box p{text-align:center;}
+.resolve{display:none;}
+.tab_report_box .round_w_orange{width:100px;height:100px;background:#ffdeb5;position:relative;overflow:hidden;border-radius:50px;margin:0 auto;}
+.tab_report_box .round_n_orange{width:70px;height:70px;background:#ffac47;position:absolute;top:15px;left:15px;overflow:hidden;border-radius:35px;}
+.tab_report_box .round_n_orange span{color:#fff;line-height:70px;text-align:center;display:inline-block;width:100%;}
+.tab_report_box .round_w_red{width:100px;height:100px;background:#ffd0c6;position:relative;overflow:hidden;border-radius:50px;margin:0 auto;}
+.tab_report_box .round_n_red{width:70px;height:70px;background:#ff8a71;position:absolute;top:15px;left:15px;overflow:hidden;border-radius:35px;}
+.tab_report_box .round_n_red span{color:#fff;line-height:70px;text-align:center;display:inline-block;width:100%;}
\ No newline at end of file
diff --git a/WebRoot/static/css/set_quetion.css b/WebRoot/static/css/set_quetion.css
new file mode 100644
index 0000000..3872583
--- /dev/null
+++ b/WebRoot/static/css/set_quetion.css
@@ -0,0 +1,52 @@
+body{width:100%;min-height:100%;height:auto;padding-bottom:80px;box-sizing:border-box;}
+li{list-style:none;}
+.choose_class{height:150px;padding:20px;background:#fff;box-shadow:0 0 10px #ccc;}
+.choose_class .col-md-10 li{width:15%;margin:0 2.5%;float:left;border:1px solid #3c7ae3;text-align:center;border-radius:3px;line-height:50px;font-size:16px;color:#fff;background:#3c7ae3;}
+.left_menu{box-shadow:0 0 10px #ccc;margin-top:10px;}
+.left_menu .tab{border-bottom:1px solid #ccc;}
+.left_menu .tab ul{padding:0;margin:0;}
+.left_menu .tab li{width:50%;box-sizing:border-box;float:left;font-size:26px;text-align:center;padding:10px 0;}
+.left_menu .tab li p{margin:0;}
+.left_menu .tab .active{border-bottom: 2px solid #3c7ae3;}
+.left_menu .tab .active p{color:#3c7ae3;}
+.left_menu .tab li:first-child{border-right:1px solid #ccc;}
+.left_menu .choose_book .book{background:#e9f0ff;padding:0 6px;}
+.left_menu .choose_book .book p{float:left;line-height:34px;margin-bottom:0;}
+.left_menu .choose_book .book img{float:right;width:20px;height:20px;margin-top:4.5px;}
+.left_menu .choose_book .book_box{display:none;}
+.left_menu .choose_book .book_box ul{padding:0;margin:0;}
+.left_menu .choose_book .book_box ul li{border-bottom:1px solid #ccc;position:relative;}
+.left_menu .choose_book .book_box p{float:left;line-height:34px;margin-bottom:0;font-size:14px;}
+.left_menu .choose_book .book_box img{float:right;width:20px;height:20px;margin-top:4.5px;}
+.left_menu .choose_book .gary{width:100%;height:15px;background:#eee;}
+.left_menu .section{padding:20px 0;}
+.left_menu .section ul{padding:0;margin:0;}
+.left_menu .section ul li{padding:10px 0;border-bottom:1px solid #ccc;}
+.left_menu .section ul li img{width:20px;height:20px;margin-right:10px;}
+.left_menu .section ul li ul{padding-left:25px;display:none;}
+.left_menu .section ul li ul li{border:0;}
+.float_box{position:absolute;top:0;background:#e9f0ff;left:100%;width:400px;height:200px;display:none;z-index:99;}
+.float_box li{width:27%;margin:0 2.5%;margin-top:10px;padding:5px 0px;text-align:center;border-radius:3px;border:1px solid #ccc;overflow:hidden;float:left;}
+.screen{width:100%;height:150px;background:#fff;box-shadow: 0 0 10px #ccc;margin-top:10px;padding:10px;}
+.tag dt,dd{display:inline-block;}
+
+.option{padding:10px 0;}
+.option ul{padding:0;}
+.option li{width:100%;padding:10px 0;}
+.option li span{vertical-align:middle;margin-right:5px;}
+.resolve{display:none;}
+.resolve_box{padding:20px 0;border-top:1px dashed #ccc;}
+.star_box{border-top:1px dashed #ccc;border-bottom:1px solid #ccc;padding:10px 0;}
+.star_box .col-md-6{float:right;}
+.star li{width:16px;height:16px;float:left;margin-left:5px;}
+.star ul{float:left;padding-left:0;margin-right:20px;}
+.star .off{background:url(../images/off.png) no-repeat;background-size:100%;}
+.star .on{background:url(../images/on.png) no-repeat;background-size:100%;}
+.check_box{float:right;width:22px;height:22px;border:2px solid #6a9cf0;border-radius:6px;}
+.checked{background:url(../images/checked.png) no-repeat;background-size:100%;border:0;}
+
+.basket{width:100%;height:80px;position:fixed;bottom:0;background:#e9f0ff;}
+.basket .basket_box{width:1200px;margin:0 auto;}
+.basket .basket_box p{display:inline-block;line-height:80px;font-size:25px;text-align:center;}
+.basket .basket_box .btn{font-size:20px;}
+.basket .basket_box .clear_que{margin-right:5%;}
diff --git a/WebRoot/static/css/teach.css b/WebRoot/static/css/teach.css
index 541216b..d582128 100644
--- a/WebRoot/static/css/teach.css
+++ b/WebRoot/static/css/teach.css
@@ -29,10 +29,14 @@ input[type="checkbox"]{margin-right:10px;}
 .content .content_l .name p:first-child{font-size:14px;}
 .content .content_l .name p:nth-child(2){font-size:20px;}
 .content .content_l .name p:nth-child(3){font-size:14px;}
-.content .content_l .tab1{border-bottom:1px solid #80afb4;}
+.content .content_l .tab1{border-bottom:1px solid #80afb4;cursor:pointer}
 .content .content_l .tab1 p{width:100%;height:77px;line-height:77px;margin-bottom:0;font-size:24px;color:#fff;padding-left:10%;}
-.content .content_l .tab1 ul{margin-bottom:0;padding:12px 0;padding-left:15%;background:#0b535b;font-size:18px;line-height:64px;display:none;}
+.content .content_l .tab1 ul{margin-bottom:0;padding:0;font-size:18px;line-height:64px;display:none;}
 .content .content_l .tab1 ul li{list-style:none;color:#fff;cursor:pointer;}
+.menu_1 li{background:#1b535b;border-bottom: 1px solid #80afb4;}
+.menu_2 li{background:#333333;border-bottom: 1px dashed #80afb4;}
+.content .content_l .tab1 ul li:last-child{border:0;}
+.content .content_l .tab1 ul li p{padding-left:15%;font-size:18px;}
 .content .content_r{margin-left:18%;height:100%;overflow-y:hidden;}
 
 
diff --git a/WebRoot/static/images/add.png b/WebRoot/static/images/add.png
new file mode 100644
index 0000000..56697ee
Binary files /dev/null and b/WebRoot/static/images/add.png differ
diff --git a/WebRoot/static/images/arrow_right.png b/WebRoot/static/images/arrow_right.png
new file mode 100644
index 0000000..8e0da42
Binary files /dev/null and b/WebRoot/static/images/arrow_right.png differ
diff --git a/WebRoot/static/images/checked.png b/WebRoot/static/images/checked.png
new file mode 100644
index 0000000..6035da3
Binary files /dev/null and b/WebRoot/static/images/checked.png differ
diff --git a/WebRoot/static/images/down_arrow.png b/WebRoot/static/images/down_arrow.png
new file mode 100644
index 0000000..b7dbc6b
Binary files /dev/null and b/WebRoot/static/images/down_arrow.png differ
diff --git a/WebRoot/static/images/off.png b/WebRoot/static/images/off.png
new file mode 100644
index 0000000..493bba0
Binary files /dev/null and b/WebRoot/static/images/off.png differ
diff --git a/WebRoot/static/images/on.png b/WebRoot/static/images/on.png
new file mode 100644
index 0000000..e9dd77f
Binary files /dev/null and b/WebRoot/static/images/on.png differ
diff --git a/WebRoot/static/images/option_1.png b/WebRoot/static/images/option_1.png
new file mode 100644
index 0000000..adad5ff
Binary files /dev/null and b/WebRoot/static/images/option_1.png differ
diff --git a/WebRoot/static/images/option_2.png b/WebRoot/static/images/option_2.png
new file mode 100644
index 0000000..4527450
Binary files /dev/null and b/WebRoot/static/images/option_2.png differ
diff --git a/WebRoot/static/images/option_3.png b/WebRoot/static/images/option_3.png
new file mode 100644
index 0000000..f039529
Binary files /dev/null and b/WebRoot/static/images/option_3.png differ
diff --git a/WebRoot/static/images/option_4.png b/WebRoot/static/images/option_4.png
new file mode 100644
index 0000000..88d8821
Binary files /dev/null and b/WebRoot/static/images/option_4.png differ
diff --git a/WebRoot/static/images/reduce.png b/WebRoot/static/images/reduce.png
new file mode 100644
index 0000000..4517abb
Binary files /dev/null and b/WebRoot/static/images/reduce.png differ
diff --git a/WebRoot/static/images/title.png b/WebRoot/static/images/title.png
new file mode 100644
index 0000000..7b35490
Binary files /dev/null and b/WebRoot/static/images/title.png differ
diff --git a/WebRoot/static/images/up_arrow.png b/WebRoot/static/images/up_arrow.png
new file mode 100644
index 0000000..45e4b98
Binary files /dev/null and b/WebRoot/static/images/up_arrow.png differ
diff --git a/WebRoot/static/js/model.js b/WebRoot/static/js/model.js
index 5d6bab2..cbab21c 100644
--- a/WebRoot/static/js/model.js
+++ b/WebRoot/static/js/model.js
@@ -1,7 +1,17 @@
 $(".tab1").click(function(){
 	var _this=$(this);
-	_this.find("ul").slideToggle(function(){
-		if(_this.find("ul").css("display")=="block")
+	_this.children("ul").slideToggle(function(){
+		if(_this.children("ul").css("display")=="block")
+			_this.find(".right").attr("class","down jiao");
+		else
+			_this.find(".down").attr("class","right jiao");
+	});
+})
+$(".menu_1 li").click(function(event){
+	event.stopPropagation();
+	var _this=$(this);
+	_this.children("ul").slideToggle(function(){
+		if(_this.children("ul").css("display")=="block")
 			_this.find(".right").attr("class","down jiao");
 		else
 			_this.find(".down").attr("class","right jiao");
diff --git a/resources/mybatis1/sunvote/ChapterMapper.xml b/resources/mybatis1/sunvote/ChapterMapper.xml
index 9fa55c1..f445f98 100644
--- a/resources/mybatis1/sunvote/ChapterMapper.xml
+++ b/resources/mybatis1/sunvote/ChapterMapper.xml
@@ -12,7 +12,7 @@
 		NAME,	
 		CDESCRIPTION,	
 		REMARK,	
-		TEACHINGMATERIAL_ID,	
+		TEXTBOOK_ID,	
 		ID
 	</sql>
 	
@@ -21,7 +21,7 @@
 		#{NAME},	
 		#{CDESCRIPTION},	
 		#{REMARK},	
-		#{TEACHINGMATERIAL_ID},	
+		#{TEXTBOOK_ID},	
 		#{ID}
 	</sql>
 	
@@ -33,12 +33,12 @@
 			NAME,	
 			CDESCRIPTION,	
 			REMARK,	
-			TEACHINGMATERIAL_ID	
+			TEXTBOOK_ID	
 		) values (
 		#{NAME},	
 		#{CDESCRIPTION},	
 		#{REMARK},	
-		#{TEACHINGMATERIAL_ID}
+		#{TEXTBOOK_ID}
 		)
 	</insert>
 	
@@ -58,7 +58,7 @@
 			NAME = #{NAME},
 			CDESCRIPTION = #{CDESCRIPTION},
 			REMARK = #{REMARK},
-			TEACHINGMATERIAL_ID = #{TEACHINGMATERIAL_ID},
+			TEXTBOOK_ID = #{TEXTBOOK_ID},
 		ID = #{ID}
 		where 
 		ID = #{ID}
@@ -119,8 +119,8 @@
 		</if>
 		
 		
-		<if test="TEACHINGMATERIAL_ID != null and TEACHINGMATERIAL_ID != ''">
-			and TEACHINGMATERIAL_ID = #{TEACHINGMATERIAL_ID}
+		<if test="TEXTBOOK_ID != null and TEXTBOOK_ID != ''">
+			and TEXTBOOK_ID = #{TEXTBOOK_ID}
 		</if>
 		
 		order by RANK
diff --git a/resources/mybatis1/sunvote/KnowledgeMapper.xml b/resources/mybatis1/sunvote/KnowledgeMapper.xml
index cfcfcdc..cf9378e 100644
--- a/resources/mybatis1/sunvote/KnowledgeMapper.xml
+++ b/resources/mybatis1/sunvote/KnowledgeMapper.xml
@@ -124,6 +124,8 @@
 			and KNOWLEDGE_FROM = #{KNOWLEDGE_FROM}
 		</if>
 		
+		
+		order by RANK
 	</select>
 	
 	
diff --git a/resources/mybatis1/sunvote/PaperMapper.xml b/resources/mybatis1/sunvote/PaperMapper.xml
index 697ed00..a14a8a8 100644
--- a/resources/mybatis1/sunvote/PaperMapper.xml
+++ b/resources/mybatis1/sunvote/PaperMapper.xml
@@ -135,6 +135,10 @@
 			and CLASS_ID = #{pd.CLASS_ID}
 		</if>
 		
+		<if test="pd.PAPER_TYPE != null and pd.PAPER_TYPE != ''"><!-- 关键词检索 -->
+			and PAPER_TYPE = #{pd.PAPER_TYPE}
+		</if>
+		
 		order by CREATE_DATE DESC
 	</select>
 	
diff --git a/resources/mybatis1/sunvote/QuestionMapper.xml b/resources/mybatis1/sunvote/QuestionMapper.xml
index d1e404c..5c32f7e 100644
--- a/resources/mybatis1/sunvote/QuestionMapper.xml
+++ b/resources/mybatis1/sunvote/QuestionMapper.xml
@@ -229,6 +229,9 @@
 		<if test="COUNT != null and COUNT != ''">
 			limit ${COUNT}
 		</if>
+		<if test="COUNT == null or COUNT == ''">
+			limit 30
+		</if>
 		
 		
 	</select>
diff --git a/resources/mybatis1/sunvote/TeachingMaterialMapper.xml b/resources/mybatis1/sunvote/TeachingMaterialMapper.xml
index e4776ae..5ac21c0 100644
--- a/resources/mybatis1/sunvote/TeachingMaterialMapper.xml
+++ b/resources/mybatis1/sunvote/TeachingMaterialMapper.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="TeachingMaterialMapper">
+<mapper namespace="TextbookMapper">
 	
 	<!--表名 -->
 	<sql id="tableName">
-		SV_TEACHINGMATERIAL
+		SV_TEXTBOOK
 	</sql>
 	
 	<!-- 字段 -->
 	<sql id="Field">
-		NAME,	
-		SUBJECT_ID,	
-		GRADE_ID,	
-		VERSION_CODE,	
-		VERSION_NAME,	
-		ID
+		ID,
+		NAME,
+		SUBJECT_ID,
+		GRADEID,
+		REMARK,
+		TEACHING_MATERIAL_ID
 	</sql>
 	
 	<!-- 字段值 -->
 	<sql id="FieldValue">
+		#{ID},	
 		#{NAME},	
 		#{SUBJECT_ID},	
 		#{GRADE_ID},	
-		#{VERSION_CODE},	
 		#{VERSION_NAME},	
-		#{ID}
+		#{REMARK},
+		#{TEACHING_MATERIAL_ID}
 	</sql>
 	
 	<!-- 新增-->
@@ -55,9 +56,9 @@
 			NAME = #{NAME},
 			SUBJECT_ID = #{SUBJECT_ID},
 			GRADE_ID = #{GRADE_ID},
-			VERSION_CODE = #{VERSION_CODE},
-			VERSION_NAME = #{VERSION_NAME},
-		ID = #{ID}
+			REMARK = #{REMARK},
+			TEACHING_MATERIAL_ID = #{TEACHING_MATERIAL_ID},
+			ID = #{ID}
 		where 
 		ID = #{ID}
 	</update>
diff --git a/resources/mybatis1/sunvote/TestPaperInfoMapper.xml b/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
index a735464..d35229c 100644
--- a/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
+++ b/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
@@ -194,6 +194,53 @@
 		</if>
 	</select>
 	
+	<!-- 测验，题目列表  -->
+	<select id="listTestPaperQuestionIDs" parameterType="pd" resultType="pd">
+		select
+		QUESTION_ID
+		from 
+		<include refid="tableName"></include>
+			where 1 =1 
+		<if test="TEST_ID != null and TEST_ID != ''">
+			and TEST_ID = #{TEST_ID}
+		</if>
+		<if test="STUDENT_ID != null and STUDENT_ID != ''">
+			and STUDENT_ID = #{STUDENT_ID}
+		</if>
+		<if test="PAPER_ID != null and PAPER_ID != ''">
+			and PAPER_ID = #{PAPER_ID}
+		</if>
+		<if test="QUESTION_ID != null and QUESTION_ID != ''">
+			and QUESTION_ID = #{QUESTION_ID}
+		</if>
+		
+		group by QUESTION_ID
+	</select>
+	
+	
+	<!-- 根据测验id，试题id，查询答题情况  -->
+	<select id="listTestPaperQuestionIDinfo" parameterType="pd" resultType="pd">
+		select
+			STUDENT_ID,	ANSWER,	`RIGHT`,	SCORE
+		from 
+		<include refid="tableName"></include>
+			where 1 =1 
+		<if test="TEST_ID != null and TEST_ID != ''">
+			and TEST_ID = #{TEST_ID}
+		</if>
+		<if test="STUDENT_ID != null and STUDENT_ID != ''">
+			and STUDENT_ID = #{STUDENT_ID}
+		</if>
+		<if test="PAPER_ID != null and PAPER_ID != ''">
+			and PAPER_ID = #{PAPER_ID}
+		</if>
+		<if test="QUESTION_ID != null and QUESTION_ID != ''">
+			and QUESTION_ID = #{QUESTION_ID}
+		</if>
+		
+			ORDER BY ANSWER
+	</select>
+	
 	<!-- 列表(全部) -->
 	<select id="reportPaperDetail" parameterType="pd" resultType="pd">
 		SELECT
diff --git a/resources/mybatis1/sunvote/TextbookMapper.xml b/resources/mybatis1/sunvote/TextbookMapper.xml
new file mode 100644
index 0000000..3686226
--- /dev/null
+++ b/resources/mybatis1/sunvote/TextbookMapper.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="TeachingMaterialMapper">
+	
+	<!--表名 -->
+	<sql id="tableName">
+		SV_TEACHINGMATERIAL
+	</sql>
+	
+	<!-- 字段 -->
+	<sql id="Field">
+		NAME,	
+		SUBJECT_ID,	
+		GRADE_ID,	
+		VERSION_CODE,	
+		VERSION_NAME,	
+		ID
+	</sql>
+	
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{NAME},	
+		#{SUBJECT_ID},	
+		#{GRADE_ID},	
+		#{VERSION_CODE},	
+		#{VERSION_NAME},	
+		#{ID}
+	</sql>
+	
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into 
+	<include refid="tableName"></include>
+		(
+		<include refid="Field"></include>
+	
+		) values (
+		<include refid="FieldValue"></include>
+		)
+	</insert>
+	
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		delete from
+		<include refid="tableName"></include>
+		where 
+			ID = #{ID}
+	</delete>
+	
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set 
+			NAME = #{NAME},
+			SUBJECT_ID = #{SUBJECT_ID},
+			GRADE_ID = #{GRADE_ID},
+			VERSION_CODE = #{VERSION_CODE},
+			VERSION_NAME = #{VERSION_NAME},
+		ID = #{ID}
+		where 
+		ID = #{ID}
+	</update>
+	
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			ID = #{ID}
+	</select>
+	
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 1=1
+		<if test="pd.keywords!= null and pd.keywords != ''"><!-- 关键词检索 -->
+			and
+				(
+				<!--	根据需求自己加检索条件
+					字段1 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
+					 or 
+					字段2 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%') 
+				-->
+				)
+		</if>
+	</select>
+	
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		
+		where 1 = 1 
+		
+		<if test="TEACHING_MATERIAL_ID != null and TEACHING_MATERIAL_ID != ''">
+			and TEACHING_MATERIAL_ID = #{TEACHING_MATERIAL_ID}
+		</if>
+		<if test="SUBJECT_ID != null and SUBJECT_ID != ''">
+			and SUBJECT_ID = #{SUBJECT_ID}
+		</if>
+		<if test="GRADE_ID != null and GRADE_ID != ''">
+			and GRADE_ID = #{GRADE_ID}
+		</if>
+		
+	</select>
+	
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		delete from
+		<include refid="tableName"></include>
+		where 
+			ID in
+		<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+	
+	<!-- fh313596790qq(青苔) -->
+</mapper>
\ No newline at end of file
diff --git a/src/com/fh/Main.java b/src/com/fh/Main.java
new file mode 100644
index 0000000..bf41bb0
--- /dev/null
+++ b/src/com/fh/Main.java
@@ -0,0 +1,81 @@
+package com.fh;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class Main {
+
+	public static void main(String[] args) {
+		
+		String username = "pressure_test" ;
+		String password = "123456" ;
+		String trueName = "" ;
+		
+		String url = "http://127.0.0.1:8080/SunvoteEducation/api/v1/tempcreateUser" ;
+		for(int i = 2 ; i <= 100 ; i++){
+			trueName = username + i ;
+			String keypadid = "0000" ;
+			if(i >= 100){
+				keypadid = keypadid + i ;
+			}else if(i > 9){
+				keypadid = keypadid + "0" + i ;
+			}else{
+				keypadid = keypadid + "00" + i ;
+			}
+			post(url + "?ACCOUT=" + trueName + "&password=" + password + "&SCHOOL_ID=4" + "&SEX=1" + "&NAME=" + trueName + "&KEYPAD_ID=" + keypadid);
+		}
+
+	}
+
+	
+	
+	static void post(String url){
+		try {
+		    //请求地址
+		    URL urlHttp = new URL(url);
+
+		    // 将url 以 open方法返回的urlConnection  连接强转为HttpURLConnection连接  (标识一个url所引用的远程对象连接)
+		    HttpURLConnection connection = (HttpURLConnection) urlHttp.openConnection();// 此时cnnection只是为一个连接对象,待连接中
+		    // 设置连接输出流为true,默认false (post 请求是以流的方式隐式的传递参数)
+		    connection.setDoOutput(true);
+
+		    // 设置连接输入流为true
+		    connection.setDoInput(true);
+
+		    // 设置请求方式为post
+		    connection.setRequestMethod("POST");
+
+		    // post请求缓存设为false
+		    connection.setUseCaches(false);
+
+		    // 设置该HttpURLConnection实例是否自动执行重定向
+		    connection.setInstanceFollowRedirects(true);
+
+		    // 设置请求头里面的各个属性 (以下为设置内容的类型,设置为经过urlEncoded编码过的from参数)
+		    // application/x-javascript text/xml->xml数据 application/x-javascript->json对象 application/x-www-form-urlencoded->表单数据
+		    // ;charset=utf-8 必须要，不然妙兜那边会出现乱码【★★★★★】
+		    connection.setRequestProperty("Content-Type", "application/x-javascript;charset=utf-8");
+
+		    connection.connect();
+
+
+		    // 连接发起请求,处理服务器响应  (从连接获取到输入流并包装为bufferedReader)
+		    BufferedReader bf = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
+		    String line;
+		    StringBuilder sb = new StringBuilder(); // 用来存储响应数据
+
+		    // 循环读取流,若不到结尾处
+		    while ((line = bf.readLine()) != null) {
+		        sb.append(line).append(System.getProperty("line.separator"));
+		    }
+		    bf.close();    // 重要且易忽略步骤 (关闭流,切记!)
+		    connection.disconnect(); // 销毁连接
+
+		
+		} catch (Exception e) {
+		    e.printStackTrace();
+		}
+	}
+}
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 4d7ca6d..e35edb7 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -52,15 +52,19 @@ import com.fh.service.sunvote.questiontype.QuestionTypeManager;
 import com.fh.service.sunvote.school.SchoolManager;
 import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager;
 import com.fh.service.sunvote.sclass.SClassManager;
+import com.fh.service.sunvote.sclass.impl.SClassService;
 import com.fh.service.sunvote.student.StudentManager;
 import com.fh.service.sunvote.studenttest.StudentTestManager;
 import com.fh.service.sunvote.subject.SubjectManager;
+import com.fh.service.sunvote.subject.impl.SubjectService;
 import com.fh.service.sunvote.teacher.TeacherManager;
 import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager;
 import com.fh.service.sunvote.testpaper.TestPaperManager;
 import com.fh.service.sunvote.testpaperinfo.TestPaperInfoManager;
+import com.fh.service.sunvote.textbook.TextbookManager;
 import com.fh.service.system.user.UserManager;
 import com.fh.util.PageData;
+import com.fh.util.SpringBeanFactoryUtils;
 import com.fh.util.Tools;
 
 @Controller
@@ -83,7 +87,7 @@ public class V1 extends BaseController {
 	private ClassRosterManager classrosterService;
 
 	@Resource(name = "classtypeService")
-	private ClassTypeManager classtypeService;
+	private ClassTypeManager classtypeService; 
 
 	@Resource(name = "gradeService")
 	private GradeManager gradeService;
@@ -171,6 +175,9 @@ public class V1 extends BaseController {
 
 	@Resource(name = "teachingmaterialService")
 	private TeachingMaterialManager teachingmaterialService;
+	
+	@Resource(name = "textbookService")
+	private TextbookManager textbookService;
 
 	@Resource(name = "cacheService")
 	private CacheManager cacheService;
@@ -237,6 +244,60 @@ public class V1 extends BaseController {
 
 		return res.toJson();
 	}
+	
+	/**
+	 * 登录
+	 * 可以通过账号密码登录、
+	 * 可以通过教师卡登录
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/userinfo", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object userinfo() throws Exception {
+		event("userinfo");
+		PageData pd = this.getPageData();
+		ResponseGson<PageData> res = new ResponseGson();
+		PageData pageData = teacherService.findById(pd);
+		if (pageData != null && pageData.getString("ID") != null) {
+			pageData.put("PASSWORD", "");// 返回参数中不返回密码
+			PageData pt = new PageData();
+			pt.put("TEACHER_ID", pageData.get("ID"));
+			// 在任课表中查找老师教哪些班级，然后查出班级信息
+			List<PageData> classInfoList = v1Service
+					.getTeacherClassInfo(pt);
+			
+			pageData.put("classInfoList", classInfoList);
+			// 在认可表中查找老师教哪些科目，然后查出科目信息
+			List<PageData> subjectList = v1Service
+					.getTeacherSubjectInfo(pt);
+			// 一个sql语句完成。
+			pageData.put("subjectList", subjectList);
+			
+			pageData.remove("SUBJECT_IDS");
+			
+			PageData eventPd = new PageData();
+			eventPd.put("EVENT_ID", get32UUID());
+			eventPd.put("EVENT_NAME", "login");
+			eventPd.put("EVENT_USER", pageData.getString("ID"));
+			eventPd.put("EVENT_TYPE", "0");
+			eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
+			if (pd.getString("CLIENT_ID") != null) {
+				eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
+			} else {
+				eventPd.put("CLIENT_ID", "CLIENT");
+			}
+			eventPd.put("EVENT_IP", getRemoteIp());
+			eventService.save(eventPd);
+			
+			res.setData(pageData);
+			// 填充数据到返回数据中
+		} else {
+			res.set1Error();
+		}
+		
+		return res.toJson();
+	}
 
 	/**
 	 * 查询班级
@@ -363,6 +424,29 @@ public class V1 extends BaseController {
 		logger.info("subject cost time : " + (System.currentTimeMillis() - cur));
 		return res.toJson();
 	}
+	
+	/**
+	 * 科目
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/subjectname", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object subjectName() throws Exception {
+		event("subject");
+		long cur = System.currentTimeMillis();
+		PageData pd = this.getPageData();
+		ResponseGson<List<PageData>> res = new ResponseGson();
+		if (!pd.containsKey("SCHOOL_ID")) {
+			List<PageData> list = subjectService.listAll(pd);
+			res.setData(list);
+		} else {
+			List<PageData> list = schoolgradesubjectService.listAllSubject(pd);
+			res.setData(list);
+		}
+		logger.info("subject cost time : " + (System.currentTimeMillis() - cur));
+		return res.toJson();
+	}
 
 	/**
 	 * 键盘扫描
@@ -546,6 +630,181 @@ public class V1 extends BaseController {
 				+ (System.currentTimeMillis() - cur));
 		return res.toJson();
 	}
+	
+	/**
+	 * 试卷详细信息
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/testpaperinfo", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object testpaperinfo() throws Exception {
+		event("testpaperinfo");
+		long cur = System.currentTimeMillis();
+		PageData pd = this.getPageData();
+		ResponseGson<PageData> res = new ResponseGson();
+		String paperId = pd.getString("ID");
+		if (!StringUtils.isEmpty(paperId)) {
+			try {
+				pd.put("TESTPAPER_ID", paperId);
+				PageData testPd = testpaperService.findById(pd);
+				if (testPd != null) {
+					PageData testInfof = new PageData();
+					testInfof.put("PAPER_ID", testPd.getString("PAPER_ID"));
+					testInfof.put("TEST_ID", paperId);
+					List<PageData> list = testpaperinfoService.listTestPaperQuestionIDs(testInfof);
+					for(PageData pad:list){
+						String optionContent = pad.getString("OPTION_CONTENT");
+						if(optionContent != null && optionContent.startsWith("[") && optionContent.endsWith("]")){
+							String[] options = optionContent.substring(1, optionContent.length() -1).split(",");
+							pad.put("OPTION_CONTENT", options);
+						}else{
+							pad.put("OPTION_CONTENT", new String[]{optionContent});
+						}
+					}
+					for(PageData pqd : list){
+						PageData tpqd = questionService.findById(pqd);
+						pqd.putAll(tpqd);
+						pqd.remove("P_ID");
+						pqd.remove("SUBJECT_ID");
+						pqd.remove("PROBLEM_TYPE_ID");
+						pqd.remove("CHAPTER_ID");
+						pqd.remove("TEACHER_ID");
+						pqd.remove("SCHOOL_ID");
+						pqd.remove("SUG_SCORE");
+						pqd.remove("SUG_PART_SCORE");
+						pqd.remove("USER_ID");
+						pqd.remove("CREATE_DATE");
+						pqd.remove("QUESTION_FROM");
+						pqd.remove("REMARK");
+						pqd.put("TEST_ID", paperId);
+						List<PageData> listinfo = testpaperinfoService.listTestPaperQuestionIDinfo(pqd);
+						List<PageData> answerInfos = new ArrayList<PageData>();
+						for(PageData pid : listinfo){
+							String answer = pid.getString("ANSWER");
+							PageData answerPd = null;
+							if(answerInfos.size() > 0){
+								answerPd = answerInfos.get(answerInfos.size() -1);
+								if(!answer.equals(answerPd.getString("ANSWER"))){
+									answerPd = new PageData();
+									answerPd.put("ANSWER", answer);
+									answerPd.put("ISRIGHT", pid.getString("RIGHT"));
+									answerInfos.add(answerPd);
+								}
+							}else{
+								answerPd = new PageData();
+								answerPd.put("ANSWER", answer);
+								answerPd.put("ISRIGHT", pid.getString("RIGHT"));
+								answerInfos.add(answerPd);
+							}
+							String strCount = answerPd.getString("COUNT");
+							int count = 0 ;
+							if(strCount != null){
+								try{
+								count = Integer.parseInt(strCount);
+								}catch(NumberFormatException ex){}
+							}
+							count ++ ;
+							answerPd.put("COUNT", count);
+						}
+						pqd.put("ANSWERINFO", answerInfos);
+						pqd.remove("TEST_ID");
+					}
+					testPd.put("QUESTIONS", list);
+				
+				}
+
+				res.setData(testPd);
+			} catch (Exception e) {
+				e.printStackTrace();
+				res.setError();
+			}
+		}
+		logger.info("testpaperinfo cost time:"
+				+ (System.currentTimeMillis() - cur));
+		return res.toJson();
+	}
+	
+	/**
+	 * 试卷详细信息
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/questionintestreportinfo", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object questionInTestReportInfo() throws Exception {
+		event("testpaperinfo");
+		long cur = System.currentTimeMillis();
+		PageData pd = this.getPageData();
+		ResponseGson<PageData> res = new ResponseGson();
+		if (pd.getString("QUESTION_ID") != null) {
+			String questionId = pd.getString("QUESTION_ID");
+			PageData pqd = new PageData();
+			pqd.put("QUESTION_ID", questionId);
+			PageData tpqd = questionService.findById(pqd);
+			pqd.putAll(tpqd);
+			pqd.remove("P_ID");
+			pqd.remove("SUBJECT_ID");
+			pqd.remove("PROBLEM_TYPE_ID");
+			pqd.remove("CHAPTER_ID");
+			pqd.remove("TEACHER_ID");
+			pqd.remove("SCHOOL_ID");
+			pqd.remove("SUG_SCORE");
+			pqd.remove("SUG_PART_SCORE");
+			pqd.remove("USER_ID");
+			pqd.remove("CREATE_DATE");
+			pqd.remove("QUESTION_FROM");
+			pqd.remove("REMARK");
+			String optionContent = pqd.getString("OPTION_CONTENT");
+			if(optionContent != null && optionContent.startsWith("[") && optionContent.endsWith("]")){
+				String[] options = optionContent.substring(1, optionContent.length() -1).split(",");
+				pqd.put("OPTION_CONTENT", options);
+			}else{
+				pqd.put("OPTION_CONTENT", new String[]{optionContent});
+			}
+			if(pd.getString("TEST_ID") != null){
+				pqd.put("TEST_ID", pd.getString("TEST_ID"));
+			}
+			List<PageData> listinfo = testpaperinfoService
+					.listTestPaperQuestionIDinfo(pqd);
+			List<PageData> answerInfos = new ArrayList<PageData>();
+			for (PageData pid : listinfo) {
+				String answer = pid.getString("ANSWER");
+				PageData answerPd = null;
+				if (answerInfos.size() > 0) {
+					answerPd = answerInfos.get(answerInfos.size() - 1);
+					if (!answer.equals(answerPd.getString("ANSWER"))) {
+						answerPd = new PageData();
+						answerPd.put("ANSWER", answer);
+						answerPd.put("ISRIGHT", pid.getString("RIGHT"));
+						answerInfos.add(answerPd);
+					}
+				} else {
+					answerPd = new PageData();
+					answerPd.put("ANSWER", answer);
+					answerPd.put("ISRIGHT", pid.getString("RIGHT"));
+					answerInfos.add(answerPd);
+				}
+				String strCount = answerPd.getString("COUNT");
+				int count = 0;
+				if (strCount != null) {
+					try {
+						count = Integer.parseInt(strCount);
+					} catch (NumberFormatException ex) {
+					}
+				}
+				count++;
+				answerPd.put("COUNT", count);
+			}
+			pqd.put("ANSWERINFO", answerInfos);
+			res.setData(pqd);
+		}else{
+			res.setDataError();
+		}
+		logger.info("testpaperinfo cost time:"
+				+ (System.currentTimeMillis() - cur));
+		return res.toJson();
+	}
 
 	/**
 	 * 试卷简要信息
@@ -655,6 +914,13 @@ public class V1 extends BaseController {
 			for (String i : id) {
 				pd.put("QUESTION_ID", i);
 				PageData data = questionService.findById(pd);
+				String optionContent = data.getString("OPTION_CONTENT");
+				if(optionContent != null && optionContent.startsWith("[") && optionContent.endsWith("]")){
+					String[] options = optionContent.substring(1, optionContent.length() -1).split(",");
+					data.put("OPTION_CONTENT", options);
+				}else{
+					data.put("OPTION_CONTENT", new String[]{optionContent});
+				}
 				if (data != null) {
 					list.add(data);
 				}
@@ -929,6 +1195,7 @@ public class V1 extends BaseController {
 					pqPd.put("RANK", question.getRank());
 					pqPd.put("NO_NAME", question.getNo_name());
 					pqPd.put("PAPERQUESTION_ID", this.get32UUID());
+					pqPd.put("P_ID", "0");
 					paperquestionService.save(pqPd);
 
 				}
@@ -1596,6 +1863,16 @@ public class V1 extends BaseController {
 		ret.setData(lpd);
 		return ret.toJson();
 	}
+	
+	@RequestMapping(value = "/textbook", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object textbook() throws Exception {
+		PageData pd = getPageData();
+		ResponseGson<List<PageData>> ret = new ResponseGson<List<PageData>>();
+		List<PageData> list = textbookService.listAll(pd);
+		ret.setData(list);
+		return ret.toJson();
+	}
 
 	/**
 	 * 获取教材版本
@@ -1677,6 +1954,15 @@ public class V1 extends BaseController {
 			pd.remove("KNOWLEDGE_ID");
 		}
 		List<PageData> list = questionService.listAllquestion(pd);
+		for(PageData pad:list){
+			String optionContent = pad.getString("OPTION_CONTENT");
+			if(optionContent != null && optionContent.startsWith("[") && optionContent.endsWith("]")){
+				String[] options = optionContent.substring(1, optionContent.length() -1).split(",");
+				pad.put("OPTION_CONTENT", options);
+			}else{
+				pad.put("OPTION_CONTENT", new String[]{optionContent});
+			}
+		}
 		res.setData(list);
 		return res.toJson();
 	}
@@ -1723,6 +2009,15 @@ public class V1 extends BaseController {
 			pd.remove("KNOWLEDGE_ID");
 		}
 		List<PageData> list = questionService.listAllRandquestion(pd);
+		for(PageData pad:list){
+			String optionContent = pad.getString("OPTION_CONTENT");
+			if(optionContent != null && optionContent.startsWith("[") && optionContent.endsWith("]")){
+				String[] options = optionContent.substring(1, optionContent.length() -1).split(",");
+				pad.put("OPTION_CONTENT", options);
+			}else{
+				pad.put("OPTION_CONTENT", new String[]{optionContent});
+			}
+		}
 		res.setData(list);
 		return res.toJson();
 	}
@@ -1891,7 +2186,6 @@ public class V1 extends BaseController {
 		try {
 			teachingmaterialService.save(pd);
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
@@ -2055,4 +2349,82 @@ public class V1 extends BaseController {
 
 		return key.toString();
 	}
+	
+	
+	/**
+	 * 根据ID，获取科目中文名称
+	 * @param type
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/subjectename", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public  String findSubjectEName() throws Exception{
+		PageData pageData = this.getPageData();
+		ResponseGson<String> res = new ResponseGson<String>();
+		pageData = subjectService.findById(pageData);
+		if(pageData != null){
+			res.setData(pageData.getString("ENAME"));
+		}else{
+			res.setDataError();
+		}
+		return res.toJson();
+	}
+	
+	/**
+	 * 根据ID或者科目英文名称
+	 * @param type
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/subjectcname", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public  String findSubjectCName() throws Exception{
+		ResponseGson<String> res = new ResponseGson<String>();
+		PageData pageData = new PageData();
+		StringBuilder sb = new StringBuilder();
+		String type  = this.getPageData().getString("ID");
+		if(type.contains(",")){
+			String[] types = type.split(",");
+			for (String t : types) {
+				pageData.put("ID", t);
+				pageData = subjectService.findById(pageData);
+				if (pageData != null) {
+					sb.append(pageData.getString("CNAME") + ";  ");
+				}
+			}
+			sb.delete(sb.length() -3, sb.length());
+		}else{
+			pageData.put("ID", type);
+			pageData = subjectService.findById(pageData);
+			if (pageData != null) {
+				sb.append(pageData.getString("CNAME"));
+			}
+		}
+		res.setData(sb.toString());
+		return res.toJson();
+	}
+	
+	/**
+	 * 根据ID班级名称
+	 * @param id
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/classname", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public  String findClassName() throws Exception {
+		ResponseGson<String> res = new ResponseGson<String>();
+		PageData pageData = this.getPageData();
+		pageData = sclassService.findById(pageData);
+		String className = "" ;
+		if(pageData != null){
+			className = pageData.getString("CLASS_NAME");
+		}else{
+			res.setDataError();
+		}
+		res.setData(className);
+		return res.toJson();
+		
+	}
 }
diff --git a/src/com/fh/controller/base/BaseController.java b/src/com/fh/controller/base/BaseController.java
index 8306c78..c1224be 100644
--- a/src/com/fh/controller/base/BaseController.java
+++ b/src/com/fh/controller/base/BaseController.java
@@ -91,6 +91,15 @@ public class BaseController {
 		return "ERROR";
 	}
 	
+	public String geTeacherID(){
+		Session session = Jurisdiction.getSession();
+		User user = (User)session.getAttribute(Const.SESSION_USER);
+		if(user != null){
+			return user.getTeacherID();
+		}
+		return "ERROR";
+	}
+	
 	
 	public String getSchoolID(){
 		Session session = Jurisdiction.getSession();
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index acb794e..2bff5ca 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -271,6 +271,64 @@ public class PaperController extends BaseController {
 		}
 		String userID = getUserID();
 		pd.put("USER_ID", userID);
+		pd.put("PAPER_TYPE","1");
+		page.setPd(pd);
+		List<PageData>	varList = paperService.list(page);	//列出Paper列表
+		mv.setViewName("sunvote/paper/paper_list2");
+		
+		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="/list3")
+	public ModelAndView list3(Page page) throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"列表Paper");
+		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
+		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());
+		}
+		String userID = getUserID();
+		pd.put("USER_ID", userID);
+		pd.put("PAPER_TYPE","101");
 		page.setPd(pd);
 		List<PageData>	varList = paperService.list(page);	//列出Paper列表
 		mv.setViewName("sunvote/paper/paper_list2");
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index c0b927c..eb04a34 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -20,8 +20,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.fh.controller.api.ResponseGson;
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
+import com.fh.service.api.V1Manager;
 import com.fh.service.sunvote.school.SchoolManager;
 import com.fh.service.sunvote.teacher.TeacherManager;
 import com.fh.service.system.fhlog.FHlogManager;
@@ -30,72 +32,84 @@ import com.fh.util.AppUtil;
 import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
+import com.fh.util.Tools;
 
-/** 
- * 说明：教师
- * 创建人：Elvis
- * 创建时间：2018-04-26
+/**
+ * 说明：教师 创建人：Elvis 创建时间：2018-04-26
  */
 @Controller
-@RequestMapping(value="/teacher")
+@RequestMapping(value = "/teacher")
 public class TeacherController extends BaseController {
-	
-	String menuUrl = "teacher/list.do"; //菜单地址(权限用)
-	@Resource(name="teacherService")
+
+	String menuUrl = "teacher/list.do"; // 菜单地址(权限用)
+	@Resource(name = "teacherService")
 	private TeacherManager teacherService;
-	
-	@Resource(name="schoolService")
+
+	@Resource(name = "schoolService")
 	private SchoolManager schoolService;
-	
-	
-	@Resource(name="userService")
+
+	@Resource(name = "userService")
 	private UserManager userService;
-	
-	@Resource(name="fhlogService")
+
+	@Resource(name = "fhlogService")
 	private FHlogManager FHLOG;
 	
-	/**保存
+	@Resource(name = "v1Service")
+	private V1Manager v1Service;
+
+	/**
+	 * 保存
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/save")
-	public ModelAndView save() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"新增Teacher");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
+	@RequestMapping(value = "/save")
+	public ModelAndView save() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "新增Teacher");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "add")) {
+			return null;
+		} // 校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("ID", this.get32UUID());
 		teacherService.save(pd);
-		
-		pd.put("USER_ID", pd.getString("ID"));	//ID 主键
-		pd.put("LAST_LOGIN", "");				//最后登录时间
-		pd.put("IP", "");						//IP
-		pd.put("STATUS", "0");					//状态
+
+		pd.put("USER_ID", pd.getString("ID")); // ID 主键
+		pd.put("LAST_LOGIN", ""); // 最后登录时间
+		pd.put("IP", ""); // IP
+		pd.put("STATUS", "0"); // 状态
 		pd.put("SKIN", "default");
-		pd.put("RIGHTS", "");		
+		pd.put("RIGHTS", "");
 		pd.put("USERNAME", pd.getString("ACCOUT"));
-		pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");		
-		pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd.getString("PASSWORD")).toString());	//密码加密
-		
-		if(null == userService.findByUsername(pd)){	//判断用户名是否存在
-			userService.saveU(pd); 					//执行保存
-			FHLOG.save(Jurisdiction.getUsername(), "新增系统用户："+pd.getString("USERNAME"));
+		pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
+		pd.put("PASSWORD",
+				new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
+						.getString("PASSWORD")).toString()); // 密码加密
+
+		if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
+			userService.saveU(pd); // 执行保存
+			FHLOG.save(Jurisdiction.getUsername(),
+					"新增系统用户：" + pd.getString("USERNAME"));
 		}
-		
-		mv.addObject("msg","success");
+
+		mv.addObject("msg", "success");
 		mv.setViewName("save_result");
 		return mv;
 	}
-	
-	/**删除
+
+	/**
+	 * 删除
+	 * 
 	 * @param out
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/delete")
-	public void delete(PrintWriter out) throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"删除Teacher");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
+	@RequestMapping(value = "/delete")
+	public void delete(PrintWriter out) throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "删除Teacher");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "del")) {
+			return;
+		} // 校验权限
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("USER_ID", pd.get("ID"));
@@ -104,177 +118,301 @@ public class TeacherController extends BaseController {
 		out.write("success");
 		out.close();
 	}
-	
-	/**修改
+
+	/**
+	 * 修改
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/edit")
-	public ModelAndView edit() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"修改Teacher");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
+	@RequestMapping(value = "/edit")
+	public ModelAndView edit() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "修改Teacher");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "edit")) {
+			return null;
+		} // 校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		teacherService.edit(pd);
-		
-		/*pd.put("USER_ID", pd.getString("ID"));	//ID 主键
-		pd.put("LAST_LOGIN", "");				//最后登录时间
-		pd.put("IP", "");						//IP
-		pd.put("STATUS", "0");					//状态
-		pd.put("SKIN", "default");
-		pd.put("RIGHTS", "");		
-		pd.put("USERNAME", pd.getString("ACCOUT"));
-		pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");		
-		pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd.getString("PASSWORD")).toString());	//密码加密
-		
-		userService.saveU(pd);*/
-		
-		mv.addObject("msg","success");
+
+		/*
+		 * pd.put("USER_ID", pd.getString("ID")); //ID 主键 pd.put("LAST_LOGIN",
+		 * ""); //最后登录时间 pd.put("IP", ""); //IP pd.put("STATUS", "0"); //状态
+		 * pd.put("SKIN", "default"); pd.put("RIGHTS", ""); pd.put("USERNAME",
+		 * pd.getString("ACCOUT")); pd.put("ROLE_ID",
+		 * "57bb1e6f138247a0b05cc721a5da1b64"); pd.put("PASSWORD", new
+		 * SimpleHash("SHA-1", pd.getString("ACCOUT"),
+		 * pd.getString("PASSWORD")).toString()); //密码加密
+		 * 
+		 * userService.saveU(pd);
+		 */
+
+		mv.addObject("msg", "success");
 		mv.setViewName("save_result");
 		return mv;
 	}
+
+	/**
+	 * 列表
+	 * 
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/teach_paper")
+	public ModelAndView teach_paper(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_paper");
+		mv.addObject("pd", pd);
+		return mv;
+	}
 	
-	/**列表
+	/**
+	 * 列表
+	 * 
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/paper_view")
+	public ModelAndView paper_view(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/paper_view");
+		mv.addObject("pd", pd);
+		return mv;
+	}
+
+	/**
+	 * 列表
+	 * 
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/set_question")
+	public ModelAndView set_question(Page page) throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "列表Paper");
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		mv.setViewName("sunvote/teacher/set_question");
+		mv.addObject("pd", pd);
+		return mv;
+	}
+
+	/**
+	 * 列表
+	 * 
 	 * @param page
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/list")
-	public ModelAndView list(Page page) throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"列表Teacher");
-		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
+	@RequestMapping(value = "/list")
+	public ModelAndView list(Page page) throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "列表Teacher");
+		// if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
+		// //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		String keywords = pd.getString("keywords");				//关键词检索条件
-		if(null != keywords && !"".equals(keywords)){
+		String keywords = pd.getString("keywords"); // 关键词检索条件
+		if (null != keywords && !"".equals(keywords)) {
 			pd.put("keywords", keywords.trim());
 		}
 		page.setPd(pd);
-		List<PageData>	varList = teacherService.list(page);	//列出Teacher列表
+		List<PageData> varList = teacherService.list(page); // 列出Teacher列表
 		mv.setViewName("sunvote/teacher/teacher_list");
 		mv.addObject("varList", varList);
-		
+
 		List<PageData> schools = schoolService.listAll(pd);
-		mv.addObject("schools",schools);
-		
+		mv.addObject("schools", schools);
+
 		mv.addObject("pd", pd);
-		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
+		mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限
 		return mv;
 	}
-	
-	/**去新增页面
+
+	/**
+	 * 去新增页面
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/goAdd")
-	public ModelAndView goAdd()throws Exception{
+	@RequestMapping(value = "/goAdd")
+	public ModelAndView goAdd() throws Exception {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		mv.setViewName("sunvote/teacher/teacher_edit");
-		
+
 		List<PageData> schools = schoolService.listAll(pd);
-		mv.addObject("schools",schools);
-		
+		mv.addObject("schools", schools);
+
 		mv.addObject("msg", "save");
 		mv.addObject("pd", pd);
 		return mv;
-	}	
-	
-	 /**去修改页面
+	}
+
+	/**
+	 * 去修改页面
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/goEdit")
-	public ModelAndView goEdit()throws Exception{
+	@RequestMapping(value = "/goEdit")
+	public ModelAndView goEdit() throws Exception {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		pd = teacherService.findById(pd);	//根据ID读取
+		pd = teacherService.findById(pd); // 根据ID读取
 		mv.setViewName("sunvote/teacher/teacher_edit");
 		List<PageData> schools = schoolService.listAll(pd);
-		mv.addObject("schools",schools);
+		mv.addObject("schools", schools);
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);
 		return mv;
-	}	
-	
-	 /**批量删除
+	}
+
+	/**
+	 * 批量删除
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/deleteAll")
+	@RequestMapping(value = "/deleteAll")
 	@ResponseBody
-	public Object deleteAll() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"批量删除Teacher");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
-		PageData pd = new PageData();		
-		Map<String,Object> map = new HashMap<String,Object>();
+	public Object deleteAll() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "批量删除Teacher");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "del")) {
+			return null;
+		} // 校验权限
+		PageData pd = new PageData();
+		Map<String, Object> map = new HashMap<String, Object>();
 		pd = this.getPageData();
 		List<PageData> pdList = new ArrayList<PageData>();
 		String DATA_IDS = pd.getString("DATA_IDS");
-		if(null != DATA_IDS && !"".equals(DATA_IDS)){
+		if (null != DATA_IDS && !"".equals(DATA_IDS)) {
 			String ArrayDATA_IDS[] = DATA_IDS.split(",");
 			teacherService.deleteAll(ArrayDATA_IDS);
 			pd.put("msg", "ok");
-		}else{
+		} else {
 			pd.put("msg", "no");
 		}
 		pdList.add(pd);
 		map.put("list", pdList);
 		return AppUtil.returnObject(pd, map);
 	}
-	
-	 /**导出到excel
+
+	/**
+	 * 导出到excel
+	 * 
 	 * @param
 	 * @throws Exception
 	 */
-	@RequestMapping(value="/excel")
-	public ModelAndView exportExcel() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"导出Teacher到excel");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
+	@RequestMapping(value = "/excel")
+	public ModelAndView exportExcel() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "导出Teacher到excel");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "cha")) {
+			return null;
+		}
 		ModelAndView mv = new ModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		Map<String,Object> dataMap = new HashMap<String,Object>();
+		Map<String, Object> dataMap = new HashMap<String, Object>();
 		List<String> titles = new ArrayList<String>();
-		titles.add("所在学校");	//1
-		titles.add("姓名");	//2
-		titles.add("电话");	//3
-		titles.add("座机电话");	//4
-		titles.add("证件号");	//5
-		titles.add("账号");	//6
-		titles.add("密码");	//7
-		titles.add("性别");	//8
-		titles.add("科目列表");	//9
-		titles.add("教师卡编号");	//10
+		titles.add("所在学校"); // 1
+		titles.add("姓名"); // 2
+		titles.add("电话"); // 3
+		titles.add("座机电话"); // 4
+		titles.add("证件号"); // 5
+		titles.add("账号"); // 6
+		titles.add("密码"); // 7
+		titles.add("性别"); // 8
+		titles.add("科目列表"); // 9
+		titles.add("教师卡编号"); // 10
 		dataMap.put("titles", titles);
 		List<PageData> varOList = teacherService.listAll(pd);
 		List<PageData> varList = new ArrayList<PageData>();
-		for(int i=0;i<varOList.size();i++){
+		for (int i = 0; i < varOList.size(); i++) {
 			PageData vpd = new PageData();
-			vpd.put("var1", varOList.get(i).get("SCHOOL_ID").toString());	//1
-			vpd.put("var2", varOList.get(i).getString("NAME"));	    //2
-			vpd.put("var3", varOList.get(i).getString("PHONE"));	    //3
-			vpd.put("var4", varOList.get(i).getString("SEAT_PHONE"));	    //4
-			vpd.put("var5", varOList.get(i).getString("CARD_NO"));	    //5
-			vpd.put("var6", varOList.get(i).getString("ACCOUT"));	    //6
-			vpd.put("var7", varOList.get(i).getString("PASSWORD"));	    //7
-			vpd.put("var8", varOList.get(i).get("SEX").toString());	//8
-			vpd.put("var9", varOList.get(i).getString("SUBJECT_IDS"));	    //9
-			vpd.put("var10", varOList.get(i).getString("KEYPAD_ID"));	    //10
+			vpd.put("var1", varOList.get(i).get("SCHOOL_ID").toString()); // 1
+			vpd.put("var2", varOList.get(i).getString("NAME")); // 2
+			vpd.put("var3", varOList.get(i).getString("PHONE")); // 3
+			vpd.put("var4", varOList.get(i).getString("SEAT_PHONE")); // 4
+			vpd.put("var5", varOList.get(i).getString("CARD_NO")); // 5
+			vpd.put("var6", varOList.get(i).getString("ACCOUT")); // 6
+			vpd.put("var7", varOList.get(i).getString("PASSWORD")); // 7
+			vpd.put("var8", varOList.get(i).get("SEX").toString()); // 8
+			vpd.put("var9", varOList.get(i).getString("SUBJECT_IDS")); // 9
+			vpd.put("var10", varOList.get(i).getString("KEYPAD_ID")); // 10
 			varList.add(vpd);
 		}
 		dataMap.put("varList", varList);
 		ObjectExcelView erv = new ObjectExcelView();
-		mv = new ModelAndView(erv,dataMap);
+		mv = new ModelAndView(erv, dataMap);
 		return mv;
 	}
-	
+
 	@InitBinder
-	public void initBinder(WebDataBinder binder){
+	public void initBinder(WebDataBinder binder) {
 		DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-		binder.registerCustomEditor(Date.class, new CustomDateEditor(format,true));
+		binder.registerCustomEditor(Date.class, new CustomDateEditor(format,
+				true));
 	}
+
+	/**
+	 * 批量删除
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/info", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object info() throws Exception {
+		PageData pd = this.getPageData();
+		ResponseGson<PageData> res = new ResponseGson();
+		pd.put("ID", this.geTeacherID());
+		PageData pageData = teacherService.findById(pd);
+		if (pageData != null && pageData.getString("ID") != null) {
+			pageData.put("PASSWORD", "");// 返回参数中不返回密码
+			PageData pt = new PageData();
+			pt.put("TEACHER_ID", pageData.get("ID"));
+			// 在任课表中查找老师教哪些班级，然后查出班级信息
+			List<PageData> classInfoList = v1Service
+					.getTeacherClassInfo(pt);
+			
+			pageData.put("classInfoList", classInfoList);
+			// 在认可表中查找老师教哪些科目，然后查出科目信息
+			List<PageData> subjectList = v1Service
+					.getTeacherSubjectInfo(pt);
+			// 一个sql语句完成。
+			pageData.put("subjectList", subjectList);
+			
+			pageData.remove("SUBJECT_IDS");
+			
+			PageData eventPd = new PageData();
+			eventPd.put("EVENT_ID", get32UUID());
+			eventPd.put("EVENT_NAME", "login");
+			eventPd.put("EVENT_USER", pageData.getString("ID"));
+			eventPd.put("EVENT_TYPE", "0");
+			eventPd.put("EVENT_START_TIME", Tools.date2Str(new Date()));
+			if (pd.getString("CLIENT_ID") != null) {
+				eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
+			} else {
+				eventPd.put("CLIENT_ID", "CLIENT");
+			}
+			res.setData(pageData);
+			// 填充数据到返回数据中
+		} else {
+			res.set1Error();
+		}
+		
+		return res.toJson();
+	}
+
 }
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 4f5dc11..7a43732 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -153,6 +153,13 @@ public class LoginController extends BaseController {
 				if ("57bb1e6f138247a0b05cc721a5da1b64".equals(pd
 						.getString("ROLE_ID"))) {
 					map.put("teacher", pd.getString("RIGHTS"));
+					PageData tpd = new PageData();
+					tpd.put("ACCOUT", pd.get("USERNAME"));
+					tpd.put("PASSWORD", PASSWORD);
+					PageData pageData = teacherService.getUserInfo(tpd);
+					if(pageData != null){
+						user.setTeacherID(pageData.getString("ID"));
+					}
 				}
 				user.setLAST_LOGIN(pd.getString("LAST_LOGIN"));
 				user.setIP(pd.getString("IP"));
diff --git a/src/com/fh/entity/system/User.java b/src/com/fh/entity/system/User.java
index 3b95d6d..7a1cc4c 100644
--- a/src/com/fh/entity/system/User.java
+++ b/src/com/fh/entity/system/User.java
@@ -17,6 +17,7 @@ public class User {
 	private Role role;			//角色对象
 	private Page page;			//分页对象
 	private String SKIN;		//皮肤
+	private String teacherID ; // 教师ID
 	
 	public String getSKIN() {
 		return SKIN;
@@ -100,5 +101,13 @@ public class User {
 	public void setPage(Page page) {
 		this.page = page;
 	}
+	public String getTeacherID() {
+		return teacherID;
+	}
+	public void setTeacherID(String teacherID) {
+		this.teacherID = teacherID;
+	}
+	
+	
 	
 }
diff --git a/src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java b/src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java
index 6b9195b..b7ddb8a 100644
--- a/src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java
+++ b/src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java
@@ -66,5 +66,25 @@ public interface TestPaperInfoManager{
 	 */
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
 	
+	
+	/**
+	 * 根据测验id，试题id，查询该问题，在该答卷的答题情况
+	 * 可以根据试卷id，试题id，查询试卷在所有测验中答题情况
+	 * 可以根据学生id，试题id，查询试题在学生下面的答题情况
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> listTestPaperQuestionIDinfo(PageData pd)throws Exception;
+	
+	
+	/**
+	 * 查询测验下面的所有试题ID列表
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> listTestPaperQuestionIDs(PageData pd)throws Exception;
+	
 }
 
diff --git a/src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java b/src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java
index 83e502e..6911f71 100644
--- a/src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java
+++ b/src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java
@@ -73,6 +73,22 @@ public class TestPaperInfoService implements TestPaperInfoManager{
 	 * @throws Exception
 	 */
 	@SuppressWarnings("unchecked")
+	public List<PageData> listTestPaperQuestionIDinfo(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("TestPaperInfoMapper.listTestPaperQuestionIDinfo", pd);
+	}
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listTestPaperQuestionIDs(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("TestPaperInfoMapper.listTestPaperQuestionIDs", pd);
+	}
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
 	public List<PageData> reportPaperDetail(PageData pd)throws Exception{
 		return (List<PageData>)dao.findForList("TestPaperInfoMapper.reportPaperDetail", pd);
 	}
diff --git a/src/com/fh/service/sunvote/textbook/TextbookManager.java b/src/com/fh/service/sunvote/textbook/TextbookManager.java
new file mode 100644
index 0000000..8bc9e0c
--- /dev/null
+++ b/src/com/fh/service/sunvote/textbook/TextbookManager.java
@@ -0,0 +1,52 @@
+package com.fh.service.sunvote.textbook;
+
+import java.util.List;
+
+import com.fh.entity.Page;
+import com.fh.util.PageData;
+
+public interface TextbookManager {
+	
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception;
+	
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception;
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception;
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception;
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception;
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception;
+	
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
+
+}
diff --git a/src/com/fh/service/sunvote/textbook/impl/TextbookService.java b/src/com/fh/service/sunvote/textbook/impl/TextbookService.java
new file mode 100644
index 0000000..9920578
--- /dev/null
+++ b/src/com/fh/service/sunvote/textbook/impl/TextbookService.java
@@ -0,0 +1,78 @@
+package com.fh.service.sunvote.textbook.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.service.sunvote.textbook.TextbookManager;
+import com.fh.util.PageData;
+
+@Service("textbookService")
+public class TextbookService implements TextbookManager {
+
+	@Resource(name = "daoSupport")
+	private DaoSupport dao;
+	
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		dao.save("TextbookMapper.save", pd);
+	}
+	
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		dao.delete("TextbookMapper.delete", pd);
+	}
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		dao.update("TextbookMapper.edit", pd);
+	}
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> list(Page page)throws Exception{
+		return (List<PageData>)dao.findForList("TextbookMapper.datalistPage", page);
+	}
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("TextbookMapper.listAll", pd);
+	}
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("TextbookMapper.findById", pd);
+	}
+	
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		dao.delete("TextbookMapper.deleteAll", ArrayDATA_IDS);
+	}
+
+}
--
libgit2 0.21.4