diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
new file mode 100644
index 0000000..7f97285
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
@@ -0,0 +1,226 @@
+<%@ 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="en">
+	<head>
+	<base href="<%=basePath%>">
+	<!-- 下拉框 -->
+	<link rel="stylesheet" href="static/ace/css/chosen.css" />
+	<!-- jsp文件头和头部 -->
+	<%@ include file="../../system/index/top.jsp"%>
+	<!-- 日期框 -->
+	<link rel="stylesheet" href="static/ace/css/datepicker.css" />
+</head>
+<body class="no-skin">
+<!-- /section:basics/navbar.layout -->
+<div class="main-container" id="main-container">
+	<!-- /section:basics/sidebar -->
+	<div class="main-content">
+		<div class="main-content-inner">
+			<div class="page-content">
+				<div class="row">
+					<div class="col-xs-12">
+					
+					<form action="student/${msg }.do" name="Form" id="Form" method="post">
+						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
+						<div id="zhongxin" style="padding-top: 13px;">
+						<table id="table_report" class="table table-striped table-bordered table-hover">
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">学生姓名:</td>
+								<td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">学籍号:</td>
+								<td><input type="text" name="SNO" id="SNO" value="${pd.SNO}" maxlength="255" placeholder="这里输入学籍号" title="学籍号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">学号:</td>
+								<td><input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}" maxlength="255" placeholder="这里输入学号" title="学号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
+								<td>
+								<%-- <input type="number" name="SEX" id="SEX" value="${pd.SEX}" maxlength="32" placeholder="这里输入性别" title="性别" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="这里输入班级类型">
+										<option value="1"  <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>
+										<option value="0"  <c:if test="${pd.SEX==0}">selected="true"</c:if>>女</option>
+								</select>
+								</td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">组号:</td>
+								<td><input type="text" name="GROUPID" id="GROUPID" value="${pd.GROUPID}" maxlength="255" placeholder="这里输入组号" title="组号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">签到码:</td>
+								<td><input type="text" name="SIGN_NO" id="SIGN_NO" value="${pd.SIGN_NO}" maxlength="255" placeholder="这里输入签到码" title="签到码" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">家长姓名:</td>
+								<td><input type="text" name="PARENT_NAME" id="PARENT_NAME" value="${pd.PARENT_NAME}" maxlength="255" placeholder="这里输入家长姓名" title="家长姓名" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">家长手机号:</td>
+								<td><input type="text" name="PARENT_PHONE" id="PARENT_PHONE" value="${pd.PARENT_PHONE}" maxlength="255" placeholder="这里输入家长手机号" title="家长手机号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">键盘ID:</td>
+								<td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入键盘ID" title="键盘ID" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">备注:</td>
+								<td><input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入备注" title="备注" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="text-align: center;" colspan="10">
+									<a class="btn btn-mini btn-primary" onclick="save();">保存</a>
+									<a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
+								</td>
+							</tr>
+						</table>
+						</div>
+						<div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
+					</form>
+					</div>
+					<!-- /.col -->
+				</div>
+				<!-- /.row -->
+			</div>
+			<!-- /.page-content -->
+		</div>
+	</div>
+	<!-- /.main-content -->
+</div>
+<!-- /.main-container -->
+
+
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot.jsp"%>
+	<!-- 下拉框 -->
+	<script src="static/ace/js/chosen.jquery.js"></script>
+	<!-- 日期框 -->
+	<script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
+	<!--提示框-->
+	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+		<script type="text/javascript">
+		$(top.hangge());
+		//保存
+		function save(){
+			if($("#NAME").val()==""){
+				$("#NAME").tips({
+					side:3,
+		            msg:'请输入学生姓名',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#NAME").focus();
+			return false;
+			}
+			if($("#SNO").val()==""){
+				$("#SNO").tips({
+					side:3,
+		            msg:'请输入学籍号',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SNO").focus();
+			return false;
+			}
+			if($("#NUMBER").val()==""){
+				$("#NUMBER").tips({
+					side:3,
+		            msg:'请输入学号',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#NUMBER").focus();
+			return false;
+			}
+			if($("#SEX").val()==""){
+				$("#SEX").tips({
+					side:3,
+		            msg:'请输入性别',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SEX").focus();
+			return false;
+			}
+			if($("#GROUPID").val()==""){
+				$("#GROUPID").tips({
+					side:3,
+		            msg:'请输入组号',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#GROUPID").focus();
+			return false;
+			}
+			if($("#SIGN_NO").val()==""){
+				$("#SIGN_NO").tips({
+					side:3,
+		            msg:'请输入签到码',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SIGN_NO").focus();
+			return false;
+			}
+			if($("#PARENT_NAME").val()==""){
+				$("#PARENT_NAME").tips({
+					side:3,
+		            msg:'请输入家长姓名',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PARENT_NAME").focus();
+			return false;
+			}
+			if($("#PARENT_PHONE").val()==""){
+				$("#PARENT_PHONE").tips({
+					side:3,
+		            msg:'请输入家长手机号',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PARENT_PHONE").focus();
+			return false;
+			}
+			if($("#KEYPAD_ID").val()==""){
+				$("#KEYPAD_ID").tips({
+					side:3,
+		            msg:'请输入键盘ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#KEYPAD_ID").focus();
+			return false;
+			}
+			if($("#REMARK").val()==""){
+				$("#REMARK").tips({
+					side:3,
+		            msg:'请输入备注',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#REMARK").focus();
+			return false;
+			}
+			$("#Form").submit();
+			$("#zhongxin").hide();
+			$("#zhongxin2").show();
+		}
+		
+		$(function() {
+			//日期框
+			$('.date-picker').datepicker({autoclose: true,todayHighlight: true});
+		});
+		</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
new file mode 100644
index 0000000..2656c84
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -0,0 +1,309 @@
+<%@ 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"%>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme() + "://"
+			+ request.getServerName() + ":" + request.getServerPort()
+			+ path + "/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<base href="<%=basePath%>">
+<!-- 下拉框 -->
+<link rel="stylesheet" href="static/ace/css/chosen.css" />
+<!-- jsp文件头和头部 -->
+<%@ include file="../../system/index/top.jsp"%>
+<!-- 日期框 -->
+<link rel="stylesheet" href="static/ace/css/datepicker.css" />
+</head>
+<body class="no-skin">
+
+	<!-- /section:basics/navbar.layout -->
+	<div class="main-container" id="main-container">
+		<!-- /section:basics/sidebar -->
+		<div class="main-content">
+			<div class="main-content-inner">
+				<div class="page-content">
+					<div class="row">
+						<div class="col-xs-12">
+							
+						<!-- 检索  -->
+						<form action="student/listcs.do" method="post" name="Form" id="Form">
+						<table style="margin-top:5px;">
+							<tr>
+							</tr>
+						</table>
+						<!-- 检索  -->
+					
+						<table id="simple-table" class="table table-striped table-bordered table-hover" style="margin-top:5px;">	
+							<thead>
+								<tr>
+									<th class="center" style="width:35px;">
+									<label class="pos-rel"><input type="checkbox" class="ace" id="zcheckbox" /><span class="lbl"></span></label>
+									</th>
+									<th class="center" style="width:50px;">序号</th>
+									<th class="center">姓名</th>
+									<th class="center">性别</th>
+									<th class="center">组号</th>
+									<th class="center">签到码</th>
+									<th class="center">键盘ID</th>
+									<th class="center">操作</th>
+								</tr>
+							</thead>
+													
+							<tbody>
+							<!-- 开始循环 -->	
+							<c:choose>
+								<c:when test="${not empty varList}">
+									<c:forEach items="${varList}" var="var" varStatus="vs">
+										<tr>
+											<td class='center'>
+												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.ID}" class="ace" /><span class="lbl"></span></label>
+											</td>
+											<td class='center' style="width: 30px;">${vs.index+1}</td>
+											<td class='center'>${var.NAME}</td>
+											<td class='center'>${var.SEX == 1 ? "男":"女"}</td>
+											<td class='center'>${var.GROUPID}</td>
+											<td class='center'>${var.SIGN_NO}</td>
+											<td class='center'>${var.KEYPAD_ID}</td>
+											<td class="center">
+												<div>
+													<a class="btn btn-xs btn-success" title="编辑" onclick="edit('${var.ID}');">
+														<i class="ace-icon fa fa-pencil-square-o bigger-120" title="编辑"></i>
+													</a>
+													<a class="btn btn-xs btn-danger" onclick="del('${var.ID}');">
+														<i class="ace-icon fa fa-trash-o bigger-120" title="删除"></i>
+													</a>
+												</div>
+											</td>
+										</tr>
+									
+									</c:forEach>
+									<c:if test="${QX.cha == 0 }">
+										<tr>
+											<td colspan="100" class="center">您无权查看</td>
+										</tr>
+									</c:if>
+								</c:when>
+								<c:otherwise>
+									<tr class="main_info">
+										<td colspan="100" class="center" >没有相关数据</td>
+									</tr>
+								</c:otherwise>
+							</c:choose>
+							</tbody>
+						</table>
+						<div class="page-header position-relative">
+						<table style="width:100%;">
+							<tr>
+								<td style="vertical-align:top;">
+									<a class="btn btn-mini btn-success" onclick="add();">新增</a>
+									<a class="btn btn-mini btn-danger" onclick="makeAll('确定要删除选中的数据吗?');" title="批量删除" ><i class='ace-icon fa fa-trash-o bigger-120'></i></a>
+								</td>
+								<td style="vertical-align:top;"><div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div></td>
+							</tr>
+						</table>
+						</div>
+						</form>
+					
+						</div>
+						<!-- /.col -->
+					</div>
+					<!-- /.row -->
+				</div>
+				<!-- /.page-content -->
+			</div>
+		</div>
+		<!-- /.main-content -->
+
+		<!-- 返回顶部 -->
+		<a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
+			<i class="ace-icon fa fa-angle-double-up icon-only bigger-110"></i>
+		</a>
+
+	</div>
+	<!-- /.main-container -->
+
+	<!-- basic scripts -->
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot.jsp"%>
+	<!-- 删除时确认窗口 -->
+	<script src="static/ace/js/bootbox.js"></script>
+	<!-- ace scripts -->
+	<script src="static/ace/js/ace/ace.js"></script>
+	<!-- 下拉框 -->
+	<script src="static/ace/js/chosen.jquery.js"></script>
+	<!-- 日期框 -->
+	<script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
+	<!--提示框-->
+	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+	<script type="text/javascript">
+		$(top.hangge());//关闭加载状态
+		//检索
+		function tosearch(){
+			top.jzts();
+			$("#Form").submit();
+		}
+		$(function() {
+		
+			//日期框
+			$('.date-picker').datepicker({
+				autoclose: true,
+				todayHighlight: true
+			});
+			
+			//下拉框
+			if(!ace.vars['touch']) {
+				$('.chosen-select').chosen({allow_single_deselect:true}); 
+				$(window)
+				.off('resize.chosen')
+				.on('resize.chosen', function() {
+					$('.chosen-select').each(function() {
+						 var $this = $(this);
+						 $this.next().css({'width': $this.parent().width()});
+					});
+				}).trigger('resize.chosen');
+				$(document).on('settings.ace.chosen', function(e, event_name, event_val) {
+					if(event_name != 'sidebar_collapsed') return;
+					$('.chosen-select').each(function() {
+						 var $this = $(this);
+						 $this.next().css({'width': $this.parent().width()});
+					});
+				});
+				$('#chosen-multiple-style .btn').on('click', function(e){
+					var target = $(this).find('input[type=radio]');
+					var which = parseInt(target.val());
+					if(which == 2) $('#form-field-select-4').addClass('tag-input-style');
+					 else $('#form-field-select-4').removeClass('tag-input-style');
+				});
+			}
+			
+			
+			//复选框全选控制
+			var active_class = 'active';
+			$('#simple-table > thead > tr > th input[type=checkbox]').eq(0).on('click', function(){
+				var th_checked = this.checked;//checkbox inside "TH" table header
+				$(this).closest('table').find('tbody > tr').each(function(){
+					var row = this;
+					if(th_checked) $(row).addClass(active_class).find('input[type=checkbox]').eq(0).prop('checked', true);
+					else $(row).removeClass(active_class).find('input[type=checkbox]').eq(0).prop('checked', false);
+				});
+			});
+		});
+		
+		//新增
+		function add(){
+			 top.jzts();
+			 var diag = new top.Dialog();
+			 diag.Drag=true;
+			 diag.Title ="新增";
+			 diag.URL = '<%=basePath%>student/goAdd2.do?class_id=${pd.CLASS_ID}&term_id=${pd.TERM_ID}';
+			 diag.Width = 450;
+			 diag.Height = 355;
+			 diag.Modal = true;				//有无遮罩窗口
+			 diag. ShowMaxButton = true;	//最大化按钮
+		     diag.ShowMinButton = true;		//最小化按钮
+			 diag.CancelEvent = function(){ //关闭事件
+				 if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){
+					 if('${page.currentPage}' == '0'){
+						 tosearch();
+					 }else{
+						 tosearch();
+					 }
+				}
+				diag.close();
+			 };
+			 diag.show();
+		}
+		
+		//删除
+		function del(Id){
+			bootbox.confirm("确定要删除吗?", function(result) {
+				if(result) {
+					top.jzts();
+					var url = "<%=basePath%>student/delete.do?ID="+Id+"&tm="+new Date().getTime();
+					$.get(url,function(data){
+						tosearch();
+					});
+				}
+			});
+		}
+		
+		//修改
+		function edit(Id){
+			 top.jzts();
+			 var diag = new top.Dialog();
+			 diag.Drag=true;
+			 diag.Title ="编辑";
+			 diag.URL = '<%=basePath%>student/goEdit2.do?ID='+Id;
+			 diag.Width = 450;
+			 diag.Height = 355;
+			 diag.Modal = true;				//有无遮罩窗口
+			 diag. ShowMaxButton = true;	//最大化按钮
+		     diag.ShowMinButton = true;		//最小化按钮 
+			 diag.CancelEvent = function(){ //关闭事件
+				 if(diag.innerFrame.contentWindow.document.getElementById('zhongxin').style.display == 'none'){
+					 tosearch();
+				}
+				diag.close();
+			 };
+			 diag.show();
+		}
+		
+		//批量操作
+		function makeAll(msg){
+			bootbox.confirm(msg, function(result) {
+				if(result) {
+					var str = '';
+					for(var i=0;i < document.getElementsByName('ids').length;i++){
+					  if(document.getElementsByName('ids')[i].checked){
+					  	if(str=='') str += document.getElementsByName('ids')[i].value;
+					  	else str += ',' + document.getElementsByName('ids')[i].value;
+					  }
+					}
+					if(str==''){
+						bootbox.dialog({
+							message: "<span class='bigger-110'>您没有选择任何内容!</span>",
+							buttons: 			
+							{ "button":{ "label":"确定", "className":"btn-sm btn-success"}}
+						});
+						$("#zcheckbox").tips({
+							side:1,
+				            msg:'点这里全选',
+				            bg:'#AE81FF',
+				            time:8
+				        });
+						return;
+					}else{
+						if(msg == '确定要删除选中的数据吗?'){
+							top.jzts();
+							$.ajax({
+								type: "POST",
+								url: '<%=basePath%>student/deleteAll.do?tm='+new Date().getTime(),
+						    	data: {DATA_IDS:str},
+								dataType:'json',
+								//beforeSend: validateData,
+								cache: false,
+								success: function(data){
+									 $.each(data.list, function(i, list){
+											tosearch();
+									 });
+								}
+							});
+						}
+					}
+				}
+			});
+		};
+		
+		//导出excel
+		function toExcel(){
+			window.location.href='<%=basePath%>student/excel.do';
+		}
+	</script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
index f6b33e6..451ed96 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -78,7 +78,7 @@
         <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="answer" placeholder="输入题目答案，以分号隔开">
+		      <input type="text" class="form-control" id="answer" placeholder="输入题目答案">
 		    </div>
 		    <div class="clearfix"></div>
 		</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 2a3d0f6..60c6221 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -93,8 +93,8 @@
 			</div>
 		</div>
 		<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-			<div class="class">
-				<p><a href="javascript:;">${var.GRADE_NAME}${var.SUBJECT_NAME} <span>${var.CLASS_NAME}</span></a></p>
+			<div class="class" onclick="javascript:chooseClass(${var.CLASS_ID},${var.TERM_ID});">
+				<p id="classStudent"><a  href="javascript:;">${var.GRADE_NAME}${var.SUBJECT_NAME} <span>${var.CLASS_NAME}</span></a></p>
 			</div>
 		</c:forEach>
 		<div class="test">测验</div>
@@ -207,6 +207,10 @@
 		$(".test").click(function(){
 			$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" src="paper/list2.do?" style="width:100%;height:'+$(".content_l").height()+'px;"></iframe>');
 		})
+		
+		function chooseClass(classID,termID){
+			$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" src="student/listcs.do?class_id="' + classID + '&term_id=' + termID + ' style="width:100%;height:'+$(".content_l").height()+'px;"></iframe>');
+		}
 		$(".analysis").click(function(){
 			$(".content_r").html('<img src="static/images/analysis.png" width="100%" />');
 		})
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index c6a842c..c5a3cf2 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -133,7 +133,8 @@
 				sv_subject.CNAME AS SUBJECT_NAME,
 				sv_subject.ID AS SUBJECT_ID,
 			  	sv_school.`NAME` as SCHOOL_NAME,
-			  	sv_school.ID AS SCHOOL_ID
+			  	sv_school.ID AS SCHOOL_ID,
+			  	term.TERM_ID
 			FROM
 				sv_coursemanagement AS couse
 			LEFT JOIN sv_term AS term ON couse.TERM_ID = term.TERM_ID
diff --git a/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml
index da4f162..745d4db 100644
--- a/resources/mybatis1/sunvote/StudentMapper.xml
+++ b/resources/mybatis1/sunvote/StudentMapper.xml
@@ -41,29 +41,9 @@
 	<insert id="save" parameterType="pd">
 		insert into 
 	<include refid="tableName"></include>
-		(
-			NAME,	
-			SNO,	
-			NUMBER,	
-			SEX,	
-			GROUPID,	
-			SIGN_NO,	
-			PARENT_NAME,	
-			PARENT_PHONE,	
-			KEYPAD_ID,	
-			REMARK
-		) values (
-		#{NAME},	
-		#{SNO},	
-		#{NUMBER},	
-		#{SEX},	
-		#{GROUPID},	
-		#{SIGN_NO},	
-		#{PARENT_NAME},	
-		#{PARENT_PHONE},	
-		#{KEYPAD_ID},	
-		#{REMARK}
-		)
+	(<include refid="Field"></include>)
+	values 
+	(<include refid="FieldValue"></include>)
 	</insert>
 	
 	<!-- 删除-->
@@ -123,6 +103,33 @@
 		</if>
 	</select>
 	
+	<!-- 列表 -->
+	<select id="dataclasslistPage" parameterType="page" resultType="pd">
+		SELECT
+			sv_student.`NAME`,
+			sv_student.SNO,
+			sv_student.NUMBER,
+			sv_student.SEX,
+			sv_student.GROUPID,
+			sv_student.SIGN_NO,
+			sv_student.PARENT_NAME,
+			sv_student.PARENT_PHONE,
+			sv_student.KEYPAD_ID,
+			sv_student.REMARK,
+			sv_student.ID
+		FROM
+			sv_student
+		LEFT JOIN sv_classroster cr ON sv_student.ID = cr.STUDENT_ID
+		LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID
+		WHERE
+			1 = 1
+		AND sv_term.START_DATE &lt; NOW()
+		AND sv_term.END_DATE &gt; NOW()
+		<if test="pd.CLASS_ID!= null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
+			AND cr.SCLASS_ID = #{pd.CLASS_ID}
+		</if>
+	</select>
+	
 	<!-- 列表(全部) -->
 	<select id="listAll" parameterType="pd" resultType="pd">
 		select
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index c125a97..85e9c49 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -8,7 +8,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Resource;
+
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.util.AppUtil;
@@ -23,6 +26,7 @@ import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
 import com.fh.util.Jurisdiction;
 import com.fh.util.Tools;
+import com.fh.service.sunvote.classroster.ClassRosterManager;
 import com.fh.service.sunvote.student.StudentManager;
 
 /** 
@@ -38,6 +42,9 @@ public class StudentController extends BaseController {
 	@Resource(name="studentService")
 	private StudentManager studentService;
 	
+	@Resource(name="classrosterService")
+	private ClassRosterManager classrosterService;
+	
 	/**保存
 	 * @param
 	 * @throws Exception
@@ -55,6 +62,36 @@ public class StudentController extends BaseController {
 		return mv;
 	}
 	
+	/**保存
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/save2")
+	public ModelAndView save2() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"新增Student");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		String studentID = this.get32UUID();
+		pd.put("ID", studentID);
+		pd = this.getPageData();
+		studentService.save(pd);
+		
+		String termID = pd.getString("TERM_ID");
+		String classID = pd.getString("CLASS_ID");
+		pd.put("CLASSROSTER_ID", get32UUID());
+		pd.put("STUDENT_ID", studentID);
+		pd.put("TERM_ID", termID);
+		pd.put("SCLASS_ID", classID);
+		classrosterService.save(pd);
+		
+		
+		
+		mv.addObject("msg","success");
+		mv.setViewName("save_result");
+		return mv;
+	}
+	
 	/**删除
 	 * @param out
 	 * @throws Exception
@@ -111,6 +148,26 @@ public class StudentController extends BaseController {
 		return mv;
 	}
 	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/listcs")
+	public ModelAndView listClassStudent(Page page) throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"列表Student");
+		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		page.setPd(pd);
+		List<PageData>	varList = studentService.datalistclassPage(page);	//列出Student列表
+		mv.setViewName("sunvote/student/student_list2");
+		mv.addObject("varList", varList);
+		mv.addObject("pd", pd);
+		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
+		return mv;
+	}
+	
 	/**去新增页面
 	 * @param
 	 * @throws Exception
@@ -126,6 +183,21 @@ public class StudentController extends BaseController {
 		return mv;
 	}	
 	
+	/**去新增页面
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goAdd2")
+	public ModelAndView goAdd2()throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		mv.setViewName("sunvote/student/student_edit");
+		mv.addObject("msg", "save2");
+		mv.addObject("pd", pd);
+		return mv;
+	}	
+	
 	 /**去修改页面
 	 * @param
 	 * @throws Exception
@@ -133,10 +205,26 @@ public class StudentController extends BaseController {
 	@RequestMapping(value="/goEdit")
 	public ModelAndView goEdit()throws Exception{
 		ModelAndView mv = this.getModelAndView();
+		PageData pd = this.getPageData();
+		pd = studentService.findById(pd);	//根据ID读取
+		mv.setViewName("sunvote/student/student_edit");
+		mv.addObject("msg", "edit");
+		mv.addObject("pd", pd);
+		return mv;
+	}	
+	/**去修改页面
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goEdit2")
+	public ModelAndView goEdit2()throws Exception{
+		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		String classID = pd.getString("CLASS_ID");
 		pd = studentService.findById(pd);	//根据ID读取
-		mv.setViewName("sunvote/student/student_edit");
+		pd.put("CLASS_ID", classID);
+		mv.setViewName("sunvote/student/student_edit2");
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);
 		return mv;
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 5b02147..36bf3b0 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -238,6 +238,8 @@ public class LoginController extends BaseController {
 								sData.get("SUBJECT_ID"));
 						session.setAttribute(USERNAME + Const.SUBJECT_NAME,
 								sData.get("SUBJECT_NAME"));
+						session.setAttribute(USERNAME + Const.TERM_ID,
+								sData.get("TERM_ID"));
 					}
 					mv.setViewName("sunvote/teacher/teacher_main");
 				}
diff --git a/src/com/fh/service/sunvote/student/StudentManager.java b/src/com/fh/service/sunvote/student/StudentManager.java
index 8c7eef8..fd75f2d 100644
--- a/src/com/fh/service/sunvote/student/StudentManager.java
+++ b/src/com/fh/service/sunvote/student/StudentManager.java
@@ -1,6 +1,7 @@
 package com.fh.service.sunvote.student;
 
 import java.util.List;
+
 import com.fh.entity.Page;
 import com.fh.util.PageData;
 
@@ -36,6 +37,12 @@ public interface StudentManager{
 	 */
 	public List<PageData> list(Page page)throws Exception;
 	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> datalistclassPage(Page page)throws Exception;
+	
 	/**列表(全部)
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/student/impl/StudentService.java b/src/com/fh/service/sunvote/student/impl/StudentService.java
index 32e5f6f..5020598 100644
--- a/src/com/fh/service/sunvote/student/impl/StudentService.java
+++ b/src/com/fh/service/sunvote/student/impl/StudentService.java
@@ -53,6 +53,15 @@ public class StudentService implements StudentManager{
 		return (List<PageData>)dao.findForList("StudentMapper.datalistPage", page);
 	}
 	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> datalistclassPage(Page page)throws Exception{
+		return (List<PageData>)dao.findForList("StudentMapper.dataclasslistPage", page);
+	}
+	
 	/**列表(全部)
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/util/Const.java b/src/com/fh/util/Const.java
index 47947ea..37a57c8 100644
--- a/src/com/fh/util/Const.java
+++ b/src/com/fh/util/Const.java
@@ -25,6 +25,7 @@ public class Const {
 	public static final String CLASS_NAME = "CLASS_NAME";
 	public static final String SUBJECT_ID = "SUBJECT_ID";
 	public static final String SUBJECT_NAME = "SUBJECT_NAME";
+	public static final String TERM_ID = "TERM_ID";
 	
 	public static final String FALSE = "F";
 	public static final String LOGIN = "/login_toLogin.do";					//登录地址

学生姓名:
学籍号:
学号:
性别:	+ <%--
组号:
签到码:
家长姓名:
家长手机号:
键盘ID:
备注:
+ 保存 + 取消 +
+ +	序号	姓名	性别	组号	签到码	键盘ID	操作
+ +	${vs.index+1}	${var.NAME}	${var.SEX == 1 ? "男":"女"}	${var.GROUPID}	${var.SIGN_NO}	${var.KEYPAD_ID}	+ + + + + + + + +
您无权查看
没有相关数据