From 9f161055ecd0f1d5fa2295734007d1099019a7d2 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Tue, 26 Jun 2018 10:32:55 +0800
Subject: [PATCH] 修改高斯客户反馈

---
 WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_edit.jsp                 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_list.jsp                 | 344 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp             |  17 ++++-------------
 WebRoot/WEB-INF/jsp/sunvote/event/event_edit.jsp                                   | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/event/event_list.jsp                                   | 376 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_edit.jsp         |  24 +++++++++++++++++++++---
 WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_list.jsp         |  27 ++++++++-------------------
 WebRoot/afterService/document/高思答题器售后维修流程.pdf                | Bin 0 -> 146165 bytes
 WebRoot/afterService/gsdt_info.html                                                |   7 +++----
 WebRoot/afterService/gsindex.html                                                  |   2 +-
 WebRoot/afterService/gsinfo.html                                                   |   7 +++----
 resources/mybatis1/api/V1Mapper.xml                                                |   2 ++
 resources/mybatis1/sunvote/AttachKeyboardMapper.xml                                | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 resources/mybatis1/sunvote/CourseManagementMapper.xml                              |  13 ++++++++-----
 resources/mybatis1/sunvote/EventMapper.xml                                         | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/api/ApiServer.java                                           |  47 ++++++++++++++++++-----------------------------
 src/com/fh/controller/api/V.java                                                   |   1 +
 src/com/fh/controller/api/V1.java                                                  |   7 +++++++
 src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java         | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java     |   6 ++++++
 src/com/fh/controller/sunvote/event/EventController.java                           | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java |  36 ++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/system/login/LoginController.java                            |  21 ++++++++++++++++++---
 src/com/fh/service/sunvote/attachkeyboard/AttachKeyboardManager.java               |  61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/service/sunvote/attachkeyboard/impl/AttachKeyboardService.java          |  90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/service/sunvote/event/EventManager.java                                 |  58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/service/sunvote/event/impl/EventService.java                            |  82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 27 files changed, 2109 insertions(+), 81 deletions(-)
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_edit.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_list.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/event/event_edit.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/event/event_list.jsp
 create mode 100644 WebRoot/afterService/document/高思答题器售后维修流程.pdf
 create mode 100644 resources/mybatis1/sunvote/AttachKeyboardMapper.xml
 create mode 100644 resources/mybatis1/sunvote/EventMapper.xml
 create mode 100644 src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java
 create mode 100644 src/com/fh/controller/sunvote/event/EventController.java
 create mode 100644 src/com/fh/service/sunvote/attachkeyboard/AttachKeyboardManager.java
 create mode 100644 src/com/fh/service/sunvote/attachkeyboard/impl/AttachKeyboardService.java
 create mode 100644 src/com/fh/service/sunvote/event/EventManager.java
 create mode 100644 src/com/fh/service/sunvote/event/impl/EventService.java

diff --git a/WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_edit.jsp
new file mode 100644
index 0000000..641ef7a
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_edit.jsp
@@ -0,0 +1,114 @@
+<%@ 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="attachkeyboard/${msg }.do" name="Form" id="Form" method="post">
+						<input type="hidden" name="ATTACHKEYBOARD_ID" id="ATTACHKEYBOARD_ID" value="${pd.ATTACHKEYBOARD_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>
+								<select class="chosen-select form-control" name="CLASS_ID" id="CLASS_ID" data-placeholder="这里输入班级类型">
+									<c:forEach var="item" items="${classs}">
+										<option value="${item.ID}"  <c:if test="${pd.CLASS_ID==item.ID}">selected="true"</c:if>>${item.CLASS_NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">键盘:</td>
+								<td><input type="text" name="KEYBOARD_ID" id="KEYBOARD_ID" value="${pd.KEYBOARD_ID}" maxlength="255" placeholder="这里输入键盘ID" title="键盘ID" 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($("#CLASS_ID").val()==""){
+				$("#CLASS_ID").tips({
+					side:3,
+		            msg:'请输入班级ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#CLASS_ID").focus();
+			return false;
+			}
+			if($("#KEYBOARD_ID").val()==""){
+				$("#KEYBOARD_ID").tips({
+					side:3,
+		            msg:'请输入键盘ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#KEYBOARD_ID").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/attachkeyboard/attachkeyboard_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_list.jsp
new file mode 100644
index 0000000..351eba0
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/attachkeyboard/attachkeyboard_list.jsp
@@ -0,0 +1,344 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme() + "://"
+			+ request.getServerName() + ":" + request.getServerPort()
+			+ path + "/";
+%>
+<!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="attachkeyboard/list.do" method="post" name="Form" id="Form">
+						<table style="margin-top:5px;">
+							
+						</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>
+									<td class='center'>班级</td>
+									<th class="center">键盘</th>
+									<th class="center">操作</th>
+								</tr>
+							</thead>
+													
+							<tbody>
+							<!-- 开始循环 -->	
+							<c:choose>
+								<c:when test="${not empty varList}">
+									<c:if test="${QX.cha == 1 }">
+									<c:forEach items="${varList}" var="var" varStatus="vs">
+										<tr>
+											<td class='center'>
+												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.ATTACHKEYBOARD_ID}" class="ace" /><span class="lbl"></span></label>
+											</td>
+											<td class='center' style="width: 30px;">${vs.index+1}</td>
+											<td class='center'>${myelfun:findClassName(var.CLASS_ID)}</td>
+											<td class='center'>${var.KEYBOARD_ID}</td>
+											<td class="center">
+												<c:if test="${QX.edit != 1 && QX.del != 1 }">
+												<span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
+												</c:if>
+												<div class="hidden-sm hidden-xs btn-group">
+													<c:if test="${QX.edit == 1 }">
+													<a class="btn btn-xs btn-success" title="编辑" onclick="edit('${var.ATTACHKEYBOARD_ID}');">
+														<i class="ace-icon fa fa-pencil-square-o bigger-120" title="编辑"></i>
+													</a>
+													</c:if>
+													<c:if test="${QX.del == 1 }">
+													<a class="btn btn-xs btn-danger" onclick="del('${var.ATTACHKEYBOARD_ID}');">
+														<i class="ace-icon fa fa-trash-o bigger-120" title="删除"></i>
+													</a>
+													</c:if>
+												</div>
+												<div class="hidden-md hidden-lg">
+													<div class="inline pos-rel">
+														<button class="btn btn-minier btn-primary dropdown-toggle" data-toggle="dropdown" data-position="auto">
+															<i class="ace-icon fa fa-cog icon-only bigger-110"></i>
+														</button>
+			
+														<ul class="dropdown-menu dropdown-only-icon dropdown-yellow dropdown-menu-right dropdown-caret dropdown-close">
+															<c:if test="${QX.edit == 1 }">
+															<li>
+																<a style="cursor:pointer;" onclick="edit('${var.ATTACHKEYBOARD_ID}');" class="tooltip-success" data-rel="tooltip" title="修改">
+																	<span class="green">
+																		<i class="ace-icon fa fa-pencil-square-o bigger-120"></i>
+																	</span>
+																</a>
+															</li>
+															</c:if>
+															<c:if test="${QX.del == 1 }">
+															<li>
+																<a style="cursor:pointer;" onclick="del('${var.ATTACHKEYBOARD_ID}');" class="tooltip-error" data-rel="tooltip" title="删除">
+																	<span class="red">
+																		<i class="ace-icon fa fa-trash-o bigger-120"></i>
+																	</span>
+																</a>
+															</li>
+															</c:if>
+														</ul>
+													</div>
+												</div>
+											</td>
+										</tr>
+									
+									</c:forEach>
+									</c:if>
+									<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;">
+									<c:if test="${QX.add == 1 }">
+									<a class="btn btn-mini btn-success" onclick="add();">新增</a>
+									</c:if>
+									<c:if test="${QX.del == 1 }">
+									<a class="btn btn-mini btn-danger" onclick="makeAll('确定要删除选中的数据吗?');" title="批量删除" ><i class='ace-icon fa fa-trash-o bigger-120'></i></a>
+									</c:if>
+								</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%>attachkeyboard/goAdd.do';
+			 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%>attachkeyboard/delete.do?ATTACHKEYBOARD_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%>attachkeyboard/goEdit.do?ATTACHKEYBOARD_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%>attachkeyboard/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%>attachkeyboard/excel.do';
+		}
+	</script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp
index f2acd0e..a81c3b1 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp
@@ -34,22 +34,13 @@
 						<form action="coursemanagement/list.do" method="post" name="Form" id="Form">
 						<table style="margin-top:5px;">
 							<tr>
-								<td>
-									<div class="nav-search">
-										<span class="input-icon">
-											<input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
-											<i class="ace-icon fa fa-search nav-search-icon"></i>
-										</span>
-									</div>
-								</td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
 								<td style="vertical-align:top;padding-left:2px;">
-								 	<select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
+								 	<select class="chosen-select form-control" name="TERM_ID" id="TERM_ID" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
 									<option value=""></option>
 									<option value="">全部</option>
-									<option value="">1</option>
-									<option value="">2</option>
+										<c:forEach var="item" items="${terms}">
+										<option value="${item.TERM_ID}">${item.NAME}</option>
+									</c:forEach>
 								  	</select>
 								</td>
 								<c:if test="${QX.cha == 1 }">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/event/event_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/event/event_edit.jsp
new file mode 100644
index 0000000..47c1f41
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/event/event_edit.jsp
@@ -0,0 +1,178 @@
+<%@ 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="event/${msg }.do" name="Form" id="Form" method="post">
+						<input type="hidden" name="EVENT_ID" id="EVENT_ID" value="${pd.EVENT_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="EVENT_NAME" id="EVENT_NAME" value="${pd.EVENT_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="EVENT_USER" id="EVENT_USER" value="${pd.EVENT_USER}" 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="EVENT_TYPE" id="EVENT_TYPE" value="${pd.EVENT_TYPE}" 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="EVENT_START_TIME" id="EVENT_START_TIME" value="${pd.EVENT_START_TIME}" 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="EVENT_STOP_TIME" id="EVENT_STOP_TIME" value="${pd.EVENT_STOP_TIME}" 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="CLIENT_ID" id="CLIENT_ID" value="${pd.CLIENT_ID}" maxlength="255" placeholder="这里输入客户ID" title="客户ID" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">IP:</td>
+								<td><input type="text" name="EVENT_IP" id="EVENT_IP" value="${pd.EVENT_IP}" maxlength="255" placeholder="这里输入IP" title="IP" 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($("#EVENT_NAME").val()==""){
+				$("#EVENT_NAME").tips({
+					side:3,
+		            msg:'请输入时间名称',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#EVENT_NAME").focus();
+			return false;
+			}
+			if($("#EVENT_USER").val()==""){
+				$("#EVENT_USER").tips({
+					side:3,
+		            msg:'请输入事件人',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#EVENT_USER").focus();
+			return false;
+			}
+			if($("#EVENT_TYPE").val()==""){
+				$("#EVENT_TYPE").tips({
+					side:3,
+		            msg:'请输入事件类型',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#EVENT_TYPE").focus();
+			return false;
+			}
+			if($("#EVENT_START_TIME").val()==""){
+				$("#EVENT_START_TIME").tips({
+					side:3,
+		            msg:'请输入事件起始时间',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#EVENT_START_TIME").focus();
+			return false;
+			}
+			if($("#EVENT_STOP_TIME").val()==""){
+				$("#EVENT_STOP_TIME").tips({
+					side:3,
+		            msg:'请输入事件结束时间',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#EVENT_STOP_TIME").focus();
+			return false;
+			}
+			if($("#CLIENT_ID").val()==""){
+				$("#CLIENT_ID").tips({
+					side:3,
+		            msg:'请输入客户ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#CLIENT_ID").focus();
+			return false;
+			}
+			if($("#EVENT_IP").val()==""){
+				$("#EVENT_IP").tips({
+					side:3,
+		            msg:'请输入IP',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#EVENT_IP").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/event/event_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/event/event_list.jsp
new file mode 100644
index 0000000..697fa5b
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/event/event_list.jsp
@@ -0,0 +1,376 @@
+<%@ 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="event/list.do" method="post" name="Form" id="Form">
+						<table style="margin-top:5px;">
+							<tr>
+								<td>
+									<div class="nav-search">
+										<span class="input-icon">
+											<input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
+											<i class="ace-icon fa fa-search nav-search-icon"></i>
+										</span>
+									</div>
+								</td>
+								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
+								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
+								<td style="vertical-align:top;padding-left:2px;">
+								 	<select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
+									<option value=""></option>
+									<option value="">全部</option>
+									<option value="">1</option>
+									<option value="">2</option>
+								  	</select>
+								</td>
+								<c:if test="${QX.cha == 1 }">
+								<td style="vertical-align:top;padding-left:2px"><a class="btn btn-light btn-xs" onclick="tosearch();"  title="检索"><i id="nav-search-icon" class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
+								</c:if>
+								<c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
+							</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">事件结束时间</th>
+									<th class="center">客户ID</th>
+									<th class="center">IP</th>
+									<th class="center">操作</th>
+								</tr>
+							</thead>
+													
+							<tbody>
+							<!-- 开始循环 -->	
+							<c:choose>
+								<c:when test="${not empty varList}">
+									<c:if test="${QX.cha == 1 }">
+									<c:forEach items="${varList}" var="var" varStatus="vs">
+										<tr>
+											<td class='center'>
+												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.EVENT_ID}" class="ace" /><span class="lbl"></span></label>
+											</td>
+											<td class='center' style="width: 30px;">${vs.index+1}</td>
+											<td class='center'>${var.EVENT_NAME}</td>
+											<td class='center'>${var.EVENT_USER}</td>
+											<td class='center'>${var.EVENT_TYPE}</td>
+											<td class='center'>${var.EVENT_START_TIME}</td>
+											<td class='center'>${var.EVENT_STOP_TIME}</td>
+											<td class='center'>${var.CLIENT_ID}</td>
+											<td class='center'>${var.EVENT_IP}</td>
+											<td class="center">
+												<c:if test="${QX.edit != 1 && QX.del != 1 }">
+												<span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
+												</c:if>
+												<div class="hidden-sm hidden-xs btn-group">
+													<c:if test="${QX.edit == 1 }">
+													<a class="btn btn-xs btn-success" title="编辑" onclick="edit('${var.EVENT_ID}');">
+														<i class="ace-icon fa fa-pencil-square-o bigger-120" title="编辑"></i>
+													</a>
+													</c:if>
+													<c:if test="${QX.del == 1 }">
+													<a class="btn btn-xs btn-danger" onclick="del('${var.EVENT_ID}');">
+														<i class="ace-icon fa fa-trash-o bigger-120" title="删除"></i>
+													</a>
+													</c:if>
+												</div>
+												<div class="hidden-md hidden-lg">
+													<div class="inline pos-rel">
+														<button class="btn btn-minier btn-primary dropdown-toggle" data-toggle="dropdown" data-position="auto">
+															<i class="ace-icon fa fa-cog icon-only bigger-110"></i>
+														</button>
+			
+														<ul class="dropdown-menu dropdown-only-icon dropdown-yellow dropdown-menu-right dropdown-caret dropdown-close">
+															<c:if test="${QX.edit == 1 }">
+															<li>
+																<a style="cursor:pointer;" onclick="edit('${var.EVENT_ID}');" class="tooltip-success" data-rel="tooltip" title="修改">
+																	<span class="green">
+																		<i class="ace-icon fa fa-pencil-square-o bigger-120"></i>
+																	</span>
+																</a>
+															</li>
+															</c:if>
+															<c:if test="${QX.del == 1 }">
+															<li>
+																<a style="cursor:pointer;" onclick="del('${var.EVENT_ID}');" class="tooltip-error" data-rel="tooltip" title="删除">
+																	<span class="red">
+																		<i class="ace-icon fa fa-trash-o bigger-120"></i>
+																	</span>
+																</a>
+															</li>
+															</c:if>
+														</ul>
+													</div>
+												</div>
+											</td>
+										</tr>
+									
+									</c:forEach>
+									</c:if>
+									<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;">
+									<c:if test="${QX.add == 1 }">
+									<a class="btn btn-mini btn-success" onclick="add();">新增</a>
+									</c:if>
+									<c:if test="${QX.del == 1 }">
+									<a class="btn btn-mini btn-danger" onclick="makeAll('确定要删除选中的数据吗?');" title="批量删除" ><i class='ace-icon fa fa-trash-o bigger-120'></i></a>
+									</c:if>
+								</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%>event/goAdd.do';
+			 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%>event/delete.do?EVENT_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%>event/goEdit.do?EVENT_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%>event/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%>event/excel.do';
+		}
+	</script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_edit.jsp
index a6d8b65..8f9ab24 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_edit.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_edit.jsp
@@ -33,15 +33,33 @@
 						<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="number" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="32" placeholder="这里输入学校" title="学校" style="width:98%;"/></td>
+								<td>
+									<select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" data-placeholder="这里输入所属学校">
+									<c:forEach var="item" items="${schools}">
+										<option value="${item.ID}"  <c:if test="${pd.SCHOOL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">年级:</td>
-								<td><input type="number" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="32" placeholder="这里输入年级" title="年级" style="width:98%;"/></td>
+								<td>
+									<select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入所属学校">
+									<c:forEach var="item" items="${grades}">
+										<option value="${item.ID}"  <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">科目:</td>
-								<td><input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td>
+								<td>
+									<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属学校">
+									<c:forEach var="item" items="${subjects}">
+										<option value="${item.ID}"  <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="text-align: center;" colspan="10">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_list.jsp
index 71fcdeb..b4c4001 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/schoolgradesubject/schoolgradesubject_list.jsp
@@ -1,6 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
 <%
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://"
@@ -33,27 +34,15 @@
 						<form action="schoolgradesubject/list.do" method="post" name="Form" id="Form">
 						<table style="margin-top:5px;">
 							<tr>
-								<td>
-									<div class="nav-search">
-										<span class="input-icon">
-											<input type="text" placeholder="这里输入关键词" class="nav-search-input" id="nav-search-input" autocomplete="off" name="keywords" value="${pd.keywords }" placeholder="这里输入关键词"/>
-											<i class="ace-icon fa fa-search nav-search-icon"></i>
-										</span>
-									</div>
-								</td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastStart" id="lastStart"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="开始日期" title="开始日期"/></td>
-								<td style="padding-left:2px;"><input class="span10 date-picker" name="lastEnd" name="lastEnd"  value="" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" style="width:88px;" placeholder="结束日期" title="结束日期"/></td>
 								<td style="vertical-align:top;padding-left:2px;">
-								 	<select class="chosen-select form-control" name="name" id="id" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
+								 	<select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" data-placeholder="请选择" style="vertical-align:top;width: 120px;">
 									<option value=""></option>
 									<option value="">全部</option>
-									<option value="">1</option>
-									<option value="">2</option>
+									<c:forEach var="item" items="${schools}">
+										<option value="${item.ID}">${item.NAME}</option>
+									</c:forEach>
 								  	</select>
 								</td>
-								<c:if test="${QX.cha == 1 }">
-								<td style="vertical-align:top;padding-left:2px"><a class="btn btn-light btn-xs" onclick="tosearch();"  title="检索"><i id="nav-search-icon" class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
-								</c:if>
 								<c:if test="${QX.toExcel == 1 }"><td style="vertical-align:top;padding-left:2px;"><a class="btn btn-light btn-xs" onclick="toExcel();" title="导出到EXCEL"><i id="nav-search-icon" class="ace-icon fa fa-download bigger-110 nav-search-icon blue"></i></a></td></c:if>
 							</tr>
 						</table>
@@ -84,9 +73,9 @@
 												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.SCHOOLGRADESUBJECT_ID}" class="ace" /><span class="lbl"></span></label>
 											</td>
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
-											<td class='center'>${var.SCHOOL_ID}</td>
-											<td class='center'>${var.GRADE_ID}</td>
-											<td class='center'>${var.SUBJECT_ID}</td>
+											<td class='center'>${myelfun:findSchoolName(var.SCHOOL_ID)}</td>
+											<td class='center'>${myelfun:findGradeName(var.GRADE_ID)}</td>
+											<td class='center'>${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
 											<td class="center">
 												<c:if test="${QX.edit != 1 && QX.del != 1 }">
 												<span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
diff --git a/WebRoot/afterService/document/高思答题器售后维修流程.pdf b/WebRoot/afterService/document/高思答题器售后维修流程.pdf
new file mode 100644
index 0000000..5a70bc4
Binary files /dev/null and b/WebRoot/afterService/document/高思答题器售后维修流程.pdf differ
diff --git a/WebRoot/afterService/gsdt_info.html b/WebRoot/afterService/gsdt_info.html
index 7da7f3c..e1877a8 100644
--- a/WebRoot/afterService/gsdt_info.html
+++ b/WebRoot/afterService/gsdt_info.html
@@ -74,8 +74,7 @@
 						<select id="system" class="form-control">
 							<option value="请选择">请选择</option>
 							<option value="Windows">Windows</option>
-							<option value="Mac">Mac</option>
-							<option value="IOS">IOS</option>
+							<option value="Mac">安卓(小鱼)</option>
 						</select>
 					</div>
 				  </div>
@@ -84,8 +83,8 @@
 					<div class="controls col-md-12" style="padding:0;">
 						<select id="softname" class="form-control">
 							<option value="请选择">请选择</option>
-							<option value="互动课堂">互动课堂</option>
-							<option value="配对工具Match Tool">配对工具Match Tool</option>
+							<option value="互动课堂">爱学习课堂答题器软件</option>
+							<option value="配对工具Match Tool">爱学习主讲端</option>
 						</select>
 					</div>
 				  </div>
diff --git a/WebRoot/afterService/gsindex.html b/WebRoot/afterService/gsindex.html
index d7a6164..b56e584 100644
--- a/WebRoot/afterService/gsindex.html
+++ b/WebRoot/afterService/gsindex.html
@@ -105,7 +105,7 @@
 	<script>
 		function down(type){
 			switch(type){
-				case 0: $(".modal-body").html('<p><a href="document/产品售后维修流程.pdf" target="_blank">产品售后维修流程</a></p>');break;
+				case 0: $(".modal-body").html('<p><a href="document/高思答题器售后维修流程.pdf" target="_blank">产品售后维修流程</a></p>');break;
 				case 1: $(".modal-body").html('<p>等待更新</p>');break;
 				case 2: $(".modal-body").html('<p><a href="document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf" target="_blank">答题器-S56-常见问题解答V1.0-20180227（高思定制）</a></p><p><a href="document/基站-EA1000-常见问题解答V1.0-20170825.pdf" target="_blank">基站-EA1000-常见问题解答V1.0-20170825</a></p>');break;
 			}
diff --git a/WebRoot/afterService/gsinfo.html b/WebRoot/afterService/gsinfo.html
index 9817863..1a53d22 100644
--- a/WebRoot/afterService/gsinfo.html
+++ b/WebRoot/afterService/gsinfo.html
@@ -74,8 +74,7 @@
 						<select id="system" class="form-control">
 							<option value="请选择">请选择</option>
 							<option value="Windows">Windows</option>
-							<option value="Mac">Mac</option>
-							<option value="IOS">IOS</option>
+							<option value="Mac">安卓(小鱼)</option>
 						</select>
 					</div>
 				  </div>
@@ -84,8 +83,8 @@
 					<div class="controls col-md-12" style="padding:0;">
 						<select id="softname" class="form-control">
 							<option value="请选择">请选择</option>
-							<option value="互动课堂">互动课堂</option>
-							<option value="配对工具Match Tool">配对工具Match Tool</option>
+							<option value="互动课堂">爱学习课堂答题器软件</option>
+							<option value="配对工具Match Tool">爱学习主讲端</option>
 						</select>
 					</div>
 				  </div>
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index 6dd64b9..d2c2d68 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -50,6 +50,8 @@
 				sv_term.START_DATE &lt; NOW()
 			AND sv_term.END_DATE &gt; NOW()
 			AND SCLASS_ID = #{SCLASS_ID}
+			
+			order by sv_student.`SNO`
 	</select>
 	
 	<!--  通过教师ID获取科目数据
diff --git a/resources/mybatis1/sunvote/AttachKeyboardMapper.xml b/resources/mybatis1/sunvote/AttachKeyboardMapper.xml
new file mode 100644
index 0000000..692f0fb
--- /dev/null
+++ b/resources/mybatis1/sunvote/AttachKeyboardMapper.xml
@@ -0,0 +1,116 @@
+<?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="AttachKeyboardMapper">
+	
+	<!--表名 -->
+	<sql id="tableName">
+		SV_ATTACHKEYBOARD
+	</sql>
+	
+	<!-- 字段 -->
+	<sql id="Field">
+		CLASS_ID,	
+		KEYBOARD_ID,	
+		ATTACHKEYBOARD_ID
+	</sql>
+	
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{CLASS_ID},	
+		#{KEYBOARD_ID},	
+		#{ATTACHKEYBOARD_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 
+			ATTACHKEYBOARD_ID = #{ATTACHKEYBOARD_ID}
+	</delete>
+	
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set 
+			CLASS_ID = #{CLASS_ID},
+			KEYBOARD_ID = #{KEYBOARD_ID},
+		ATTACHKEYBOARD_ID = ATTACHKEYBOARD_ID
+		where 
+		ATTACHKEYBOARD_ID = #{ATTACHKEYBOARD_ID}
+	</update>
+	
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			ATTACHKEYBOARD_ID = #{ATTACHKEYBOARD_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>
+	</select>
+	
+	<!-- 列表(全部) -->
+	<select id="listAllClassId" parameterType="pd" resultType="pd">
+		select
+		KEYBOARD_ID
+		from 
+		<include refid="tableName"></include>
+		where 1 = 1 
+		<if test="CLASS_ID != null and CLASS_ID  != ''"><!-- 关键词检索 -->
+			and CLASS_ID = #{CLASS_ID}
+		</if>
+	</select>
+	
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		delete from
+		<include refid="tableName"></include>
+		where 
+			ATTACHKEYBOARD_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/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml
index 07b0456..9cbb0f7 100644
--- a/resources/mybatis1/sunvote/CourseManagementMapper.xml
+++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -106,11 +106,14 @@
 		<if test="pd.keywords!= null and pd.keywords != ''"><!-- 关键词检索 -->
 			and
 				(
-				<!--	根据需求自己加检索条件
-					字段1 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-					 or 
-					字段2 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%') 
-				-->
+				
+				)
+		</if>
+		
+		<if test="pd.TERM_ID!= null and pd.TERM_ID != ''"><!-- 关键词检索 -->
+			and
+				(
+				TERM_ID = #{pd.TERM_ID}
 				)
 		</if>
 	</select>
diff --git a/resources/mybatis1/sunvote/EventMapper.xml b/resources/mybatis1/sunvote/EventMapper.xml
new file mode 100644
index 0000000..ad9872a
--- /dev/null
+++ b/resources/mybatis1/sunvote/EventMapper.xml
@@ -0,0 +1,119 @@
+<?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="EventMapper">
+	
+	<!--表名 -->
+	<sql id="tableName">
+		SV_EVENT
+	</sql>
+	
+	<!-- 字段 -->
+	<sql id="Field">
+		EVENT_NAME,	
+		EVENT_USER,	
+		EVENT_TYPE,	
+		EVENT_START_TIME,	
+		EVENT_STOP_TIME,	
+		CLIENT_ID,	
+		EVENT_IP,	
+		EVENT_ID
+	</sql>
+	
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{EVENT_NAME},	
+		#{EVENT_USER},	
+		#{EVENT_TYPE},	
+		#{EVENT_START_TIME},	
+		#{EVENT_STOP_TIME},	
+		#{CLIENT_ID},	
+		#{EVENT_IP},	
+		#{EVENT_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 
+			EVENT_ID = #{EVENT_ID}
+	</delete>
+	
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set 
+			EVENT_NAME = #{EVENT_NAME},
+			EVENT_USER = #{EVENT_USER},
+			EVENT_TYPE = #{EVENT_TYPE},
+			EVENT_START_TIME = #{EVENT_START_TIME},
+			EVENT_STOP_TIME = #{EVENT_STOP_TIME},
+			CLIENT_ID = #{CLIENT_ID},
+			EVENT_IP = #{EVENT_IP},
+		EVENT_ID = EVENT_ID
+		where 
+		EVENT_ID = #{EVENT_ID}
+	</update>
+	
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			EVENT_ID = #{EVENT_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>
+	</select>
+	
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		delete from
+		<include refid="tableName"></include>
+		where 
+			EVENT_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/controller/api/ApiServer.java b/src/com/fh/controller/api/ApiServer.java
index 91d1db8..273345c 100644
--- a/src/com/fh/controller/api/ApiServer.java
+++ b/src/com/fh/controller/api/ApiServer.java
@@ -348,44 +348,33 @@ public class ApiServer extends BaseController {
 
 	@RequestMapping(value = "/feedback/add", produces = "application/json;charset=UTF-8")
 	@ResponseBody
-	public Object feedbackAdd(CommonsMultipartFile  file, HttpServletRequest request)
-			throws Exception {
+	public Object feedbackAdd(HttpServletRequest request)
+ throws Exception {
 		PageData pd = this.getPageData();
 		ResponseGson<PageData> res = new ResponseGson();
 		String path = request.getSession().getServletContext()
 				.getRealPath("/images");
 		File pathFile = new File(path);
-		if(!pathFile.exists()){
+		if (!pathFile.exists()) {
 			pathFile.mkdirs();
 		}
 		logger.info(path);
-		if (file != null) {
-			String fileName = file.getOriginalFilename();
-			File dir = new File(path, Tools.date2Str(new Date()) + fileName);
-			if (!dir.exists()) {
-				dir.mkdirs();
-			}
-			file.transferTo(dir);
-
-			pd.put("PROBLEM_PATH", dir.getAbsolutePath());
-			logger.info(dir.getAbsolutePath());
-		} else {
-			if (pd.get("PROBLEM_PATH") != null) {
-				String imgStr = pd.getString("PROBLEM_PATH");
-				String[] content = imgStr.split(";base64,");
-				if (content.length >= 2) {
-					String fileType = ".file";
-					if (content[0].contains("image")) {
-						fileType = content[0].substring(11,content[0].length());
-					}
-					String filename = "fb_"	+ System.currentTimeMillis() + "." + fileType ;
-					File dir = new File(path + File.separator + filename );
-					if (!dir.exists()) {
-						dir.createNewFile();
-					}
-					generateImage(content[1], dir.getAbsolutePath());
-					pd.put("PROBLEM_PATH", filename);
+		if (pd.get("PROBLEM_PATH") != null) {
+			String imgStr = pd.getString("PROBLEM_PATH");
+			String[] content = imgStr.split(";base64,");
+			if (content.length >= 2) {
+				String fileType = ".file";
+				if (content[0].contains("image")) {
+					fileType = content[0].substring(11, content[0].length());
+				}
+				String filename = "fb_" + System.currentTimeMillis() + "."
+						+ fileType;
+				File dir = new File(path + File.separator + filename);
+				if (!dir.exists()) {
+					dir.createNewFile();
 				}
+				generateImage(content[1], dir.getAbsolutePath());
+				pd.put("PROBLEM_PATH", filename);
 			}
 		}
 		String id = pd.getString("ID");
diff --git a/src/com/fh/controller/api/V.java b/src/com/fh/controller/api/V.java
index 82bed06..5780a8d 100644
--- a/src/com/fh/controller/api/V.java
+++ b/src/com/fh/controller/api/V.java
@@ -54,6 +54,7 @@ public class V extends BaseController {
 			PageData ret = schoolService.findById(pd);
 			ResponseGson<PageData> res = new ResponseGson();
 			res.setData(ret);
+			
 			return res.toJson();
 		} else {
 			List<PageData> ret = schoolService.listAll(pd);
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index c8de181..148233b 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -24,6 +24,7 @@ import com.fh.service.api.V1Manager;
 import com.fh.service.feedback.feedback.FeedbackManager;
 import com.fh.service.feedback.problemphenomenon.ProblemPhenomenonManager;
 import com.fh.service.software.softwareversion.SoftwareVersionManager;
+import com.fh.service.sunvote.attachkeyboard.AttachKeyboardManager;
 import com.fh.service.sunvote.basestation.BasestationManager;
 import com.fh.service.sunvote.chapter.ChapterManager;
 import com.fh.service.sunvote.classbasetation.ClassBasetationManager;
@@ -146,6 +147,9 @@ public class V1 extends BaseController {
 	
 	@Resource(name="softwareversionService")
 	private SoftwareVersionManager softwareversionService;
+	
+	@Resource(name="attachkeyboardService")
+	private AttachKeyboardManager attachkeyboardService;
 
 	@RequestMapping(value = "/login", produces = "application/json;charset=UTF-8")
 	@ResponseBody
@@ -200,6 +204,9 @@ public class V1 extends BaseController {
 				pt.put("SCLASS_ID", pageData.get("ID"));
 				List<PageData> studentList = v1Service.getClassStudent(pt);
 				pageData.put("studentList", studentList);
+				pt.put("CLASS_ID", pageData.get("ID"));
+				List<PageData> keyboards = attachkeyboardService.listAllClassId(pt);
+				pageData.put("keyboards", keyboards);
 				res.setData(pageData);
 			} else {
 				res.set2Error();
diff --git a/src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java b/src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java
new file mode 100644
index 0000000..08272a7
--- /dev/null
+++ b/src/com/fh/controller/sunvote/attachkeyboard/AttachKeyboardController.java
@@ -0,0 +1,218 @@
+package com.fh.controller.sunvote.attachkeyboard;
+
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+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;
+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;
+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.attachkeyboard.AttachKeyboardManager;
+import com.fh.service.sunvote.sclass.SClassManager;
+
+/** 
+ * 说明：班级附加键盘
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-25
+ */
+@Controller
+@RequestMapping(value="/attachkeyboard")
+public class AttachKeyboardController extends BaseController {
+	
+	String menuUrl = "attachkeyboard/list.do"; //菜单地址(权限用)
+	@Resource(name="attachkeyboardService")
+	private AttachKeyboardManager attachkeyboardService;
+	
+	@Resource(name="sclassService")
+	private SClassManager sclassService;
+	
+	/**保存
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/save")
+	public ModelAndView save() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"新增AttachKeyboard");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("ATTACHKEYBOARD_ID", this.get32UUID());	//主键
+		attachkeyboardService.save(pd);
+		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()+"删除AttachKeyboard");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		attachkeyboardService.delete(pd);
+		out.write("success");
+		out.close();
+	}
+	
+	/**修改
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/edit")
+	public ModelAndView edit() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"修改AttachKeyboard");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		attachkeyboardService.edit(pd);
+		mv.addObject("msg","success");
+		mv.setViewName("save_result");
+		return mv;
+	}
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/list")
+	public ModelAndView list(Page page) throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"列表AttachKeyboard");
+		//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());
+		}
+		page.setPd(pd);
+		List<PageData>	varList = attachkeyboardService.list(page);	//列出AttachKeyboard列表
+		mv.setViewName("sunvote/attachkeyboard/attachkeyboard_list");
+		mv.addObject("varList", varList);
+		mv.addObject("pd", pd);
+		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
+		return mv;
+	}
+	
+	/**去新增页面
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goAdd")
+	public ModelAndView goAdd()throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		mv.setViewName("sunvote/attachkeyboard/attachkeyboard_edit");
+		List<PageData> classs = sclassService.listAll(pd);
+		mv.addObject("classs",classs);
+		mv.addObject("msg", "save");
+		mv.addObject("pd", pd);
+		return mv;
+	}	
+	
+	 /**去修改页面
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goEdit")
+	public ModelAndView goEdit()throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = attachkeyboardService.findById(pd);	//根据ID读取
+		mv.setViewName("sunvote/attachkeyboard/attachkeyboard_edit");
+		List<PageData> classs = sclassService.listAll(pd);
+		mv.addObject("classs",classs);
+		mv.addObject("msg", "edit");
+		mv.addObject("pd", pd);
+		return mv;
+	}	
+	
+	 /**批量删除
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/deleteAll")
+	@ResponseBody
+	public Object deleteAll() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"批量删除AttachKeyboard");
+		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)){
+			String ArrayDATA_IDS[] = DATA_IDS.split(",");
+			attachkeyboardService.deleteAll(ArrayDATA_IDS);
+			pd.put("msg", "ok");
+		}else{
+			pd.put("msg", "no");
+		}
+		pdList.add(pd);
+		map.put("list", pdList);
+		return AppUtil.returnObject(pd, map);
+	}
+	
+	 /**导出到excel
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/excel")
+	public ModelAndView exportExcel() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"导出AttachKeyboard到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>();
+		List<String> titles = new ArrayList<String>();
+		titles.add("班级ID");	//1
+		titles.add("键盘ID");	//2
+		dataMap.put("titles", titles);
+		List<PageData> varOList = attachkeyboardService.listAll(pd);
+		List<PageData> varList = new ArrayList<PageData>();
+		for(int i=0;i<varOList.size();i++){
+			PageData vpd = new PageData();
+			vpd.put("var1", varOList.get(i).getString("CLASS_ID"));	    //1
+			vpd.put("var2", varOList.get(i).getString("KEYBOARD_ID"));	    //2
+			varList.add(vpd);
+		}
+		dataMap.put("varList", varList);
+		ObjectExcelView erv = new ObjectExcelView();
+		mv = new ModelAndView(erv,dataMap);
+		return mv;
+	}
+	
+	@InitBinder
+	public void initBinder(WebDataBinder binder){
+		DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		binder.registerCustomEditor(Date.class, new CustomDateEditor(format,true));
+	}
+}
diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
index f54af4e..64c1bbb 100644
--- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
+++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
@@ -61,6 +61,8 @@ public class CourseManagementController extends BaseController {
 	@Resource(name="gradeService")
 	private GradeManager gradeService;
 	
+	
+	
 	/**保存
 	 * @param
 	 * @throws Exception
@@ -131,6 +133,10 @@ public class CourseManagementController extends BaseController {
 		List<PageData>	varList = coursemanagementService.list(page);	//列出CourseManagement列表
 		mv.setViewName("sunvote/coursemanagement/coursemanagement_list");
 		mv.addObject("varList", varList);
+		
+		List<PageData> terms = termService.listAll(pd);
+		mv.addObject("terms", terms);
+		
 		mv.addObject("pd", pd);
 		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
 		return mv;
diff --git a/src/com/fh/controller/sunvote/event/EventController.java b/src/com/fh/controller/sunvote/event/EventController.java
new file mode 100644
index 0000000..ffdccb3
--- /dev/null
+++ b/src/com/fh/controller/sunvote/event/EventController.java
@@ -0,0 +1,217 @@
+package com.fh.controller.sunvote.event;
+
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+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;
+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;
+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.event.EventManager;
+
+/** 
+ * 说明：事件记录
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-26
+ */
+@Controller
+@RequestMapping(value="/event")
+public class EventController extends BaseController {
+	
+	String menuUrl = "event/list.do"; //菜单地址(权限用)
+	@Resource(name="eventService")
+	private EventManager eventService;
+	
+	/**保存
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/save")
+	public ModelAndView save() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"新增Event");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("EVENT_ID", this.get32UUID());	//主键
+		eventService.save(pd);
+		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()+"删除Event");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		eventService.delete(pd);
+		out.write("success");
+		out.close();
+	}
+	
+	/**修改
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/edit")
+	public ModelAndView edit() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"修改Event");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		eventService.edit(pd);
+		mv.addObject("msg","success");
+		mv.setViewName("save_result");
+		return mv;
+	}
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/list")
+	public ModelAndView list(Page page) throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"列表Event");
+		//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());
+		}
+		page.setPd(pd);
+		List<PageData>	varList = eventService.list(page);	//列出Event列表
+		mv.setViewName("sunvote/event/event_list");
+		mv.addObject("varList", varList);
+		mv.addObject("pd", pd);
+		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
+		return mv;
+	}
+	
+	/**去新增页面
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goAdd")
+	public ModelAndView goAdd()throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		mv.setViewName("sunvote/event/event_edit");
+		mv.addObject("msg", "save");
+		mv.addObject("pd", pd);
+		return mv;
+	}	
+	
+	 /**去修改页面
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goEdit")
+	public ModelAndView goEdit()throws Exception{
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = eventService.findById(pd);	//根据ID读取
+		mv.setViewName("sunvote/event/event_edit");
+		mv.addObject("msg", "edit");
+		mv.addObject("pd", pd);
+		return mv;
+	}	
+	
+	 /**批量删除
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/deleteAll")
+	@ResponseBody
+	public Object deleteAll() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"批量删除Event");
+		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)){
+			String ArrayDATA_IDS[] = DATA_IDS.split(",");
+			eventService.deleteAll(ArrayDATA_IDS);
+			pd.put("msg", "ok");
+		}else{
+			pd.put("msg", "no");
+		}
+		pdList.add(pd);
+		map.put("list", pdList);
+		return AppUtil.returnObject(pd, map);
+	}
+	
+	 /**导出到excel
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/excel")
+	public ModelAndView exportExcel() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"导出Event到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>();
+		List<String> titles = new ArrayList<String>();
+		titles.add("时间名称");	//1
+		titles.add("事件人");	//2
+		titles.add("事件类型");	//3
+		titles.add("事件起始时间");	//4
+		titles.add("事件结束时间");	//5
+		titles.add("客户ID");	//6
+		titles.add("IP");	//7
+		dataMap.put("titles", titles);
+		List<PageData> varOList = eventService.listAll(pd);
+		List<PageData> varList = new ArrayList<PageData>();
+		for(int i=0;i<varOList.size();i++){
+			PageData vpd = new PageData();
+			vpd.put("var1", varOList.get(i).getString("EVENT_NAME"));	    //1
+			vpd.put("var2", varOList.get(i).getString("EVENT_USER"));	    //2
+			vpd.put("var3", varOList.get(i).getString("EVENT_TYPE"));	    //3
+			vpd.put("var4", varOList.get(i).getString("EVENT_START_TIME"));	    //4
+			vpd.put("var5", varOList.get(i).getString("EVENT_STOP_TIME"));	    //5
+			vpd.put("var6", varOList.get(i).getString("CLIENT_ID"));	    //6
+			vpd.put("var7", varOList.get(i).getString("EVENT_IP"));	    //7
+			varList.add(vpd);
+		}
+		dataMap.put("varList", varList);
+		ObjectExcelView erv = new ObjectExcelView();
+		mv = new ModelAndView(erv,dataMap);
+		return mv;
+	}
+	
+	@InitBinder
+	public void initBinder(WebDataBinder binder){
+		DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		binder.registerCustomEditor(Date.class, new CustomDateEditor(format,true));
+	}
+}
diff --git a/src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java b/src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java
index 5da14dd..25e8733 100644
--- a/src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java
+++ b/src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.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,7 +26,11 @@ 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.grade.GradeManager;
+import com.fh.service.sunvote.school.SchoolManager;
 import com.fh.service.sunvote.schoolgradesubject.SchoolGradeSubjectManager;
+import com.fh.service.sunvote.subject.SubjectManager;
+import com.fh.service.system.fhlog.FHlogManager;
 
 /** 
  * 说明：学校年级科目表
@@ -37,6 +44,15 @@ public class SchoolGradeSubjectController extends BaseController {
 	@Resource(name="schoolgradesubjectService")
 	private SchoolGradeSubjectManager schoolgradesubjectService;
 	
+	@Resource(name="schoolService")
+	private SchoolManager schoolService;
+	
+	@Resource(name="gradeService")
+	private GradeManager gradeService;
+	
+	@Resource(name="subjectService")
+	private SubjectManager subjectService;
+	
 	/**保存 
 	 * @param
 	 * @throws Exception
@@ -106,6 +122,12 @@ public class SchoolGradeSubjectController extends BaseController {
 		List<PageData>	varList = schoolgradesubjectService.list(page);	//列出SchoolGradeSubject列表
 		mv.setViewName("sunvote/schoolgradesubject/schoolgradesubject_list");
 		mv.addObject("varList", varList);
+		
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools",schools);
+		List<PageData> grades = gradeService.listAll(pd);
+		mv.addObject("grades", grades);
+		
 		mv.addObject("pd", pd);
 		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
 		return mv;
@@ -122,6 +144,12 @@ public class SchoolGradeSubjectController extends BaseController {
 		pd = this.getPageData();
 		mv.setViewName("sunvote/schoolgradesubject/schoolgradesubject_edit");
 		mv.addObject("msg", "save");
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools",schools);
+		List<PageData> grades = gradeService.listAll(pd);
+		mv.addObject("grades", grades);
+		List<PageData> subjects = subjectService.listAll(pd);
+		mv.addObject("subjects", subjects);
 		mv.addObject("pd", pd);
 		return mv;
 	}	
@@ -138,6 +166,14 @@ public class SchoolGradeSubjectController extends BaseController {
 		pd = schoolgradesubjectService.findById(pd);	//根据ID读取
 		mv.setViewName("sunvote/schoolgradesubject/schoolgradesubject_edit");
 		mv.addObject("msg", "edit");
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools",schools);
+		List<PageData> grades = gradeService.listAll(pd);
+		mv.addObject("grades", grades);
+		List<PageData> subjects = subjectService.listAll(pd);
+		mv.addObject("subjects", subjects);
+		
+		
 		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 36bf3b0..fd93d62 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -1,6 +1,7 @@
 package com.fh.controller.system.login;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,8 +22,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.fh.controller.base.BaseController;
+import com.fh.entity.system.Menu;
+import com.fh.entity.system.Role;
+import com.fh.entity.system.User;
 import com.fh.service.api.V1Manager;
 import com.fh.service.fhoa.datajur.DatajurManager;
+import com.fh.service.sunvote.event.EventManager;
 import com.fh.service.sunvote.school.SchoolManager;
 import com.fh.service.sunvote.teacher.TeacherManager;
 import com.fh.service.system.appuser.AppuserManager;
@@ -31,9 +36,6 @@ import com.fh.service.system.fhbutton.FhbuttonManager;
 import com.fh.service.system.fhlog.FHlogManager;
 import com.fh.service.system.loginimg.LogInImgManager;
 import com.fh.service.system.menu.MenuManager;
-import com.fh.entity.system.Menu;
-import com.fh.entity.system.Role;
-import com.fh.entity.system.User;
 import com.fh.service.system.role.RoleManager;
 import com.fh.service.system.user.UserManager;
 import com.fh.util.AppUtil;
@@ -81,6 +83,8 @@ public class LoginController extends BaseController {
 	@Resource(name = "v1Service")
 	private V1Manager v1Service ;
 
+	@Resource(name="eventService")
+	private EventManager eventService;
 	/**
 	 * 访问登录页
 	 * 
@@ -134,6 +138,17 @@ public class LoginController extends BaseController {
 				user.setNAME(pd.getString("NAME"));
 				user.setRIGHTS(pd.getString("RIGHTS"));
 				user.setROLE_ID(pd.getString("ROLE_ID"));
+				
+				PageData eventPd = new PageData();
+				eventPd.put("EVENT_ID", get32UUID());
+				eventPd.put("EVENT_NAME", "login");
+				eventPd.put("EVENT_USER", pd.getString("USER_ID"));
+				eventPd.put("EVENT_TYPE", "0");
+				eventPd.put("EVENT_START_TIME",Tools.date2Str(new Date()));
+				eventPd.put("CLIENT_ID", "SERVER");
+				eventPd.put("EVENT_IP",pd.getString("IP"));
+				eventService.save(eventPd);
+				
 				if("57bb1e6f138247a0b05cc721a5da1b64".equals(pd.getString("ROLE_ID"))){
 					map.put("teacher", pd.getString("RIGHTS"));
 				}
diff --git a/src/com/fh/service/sunvote/attachkeyboard/AttachKeyboardManager.java b/src/com/fh/service/sunvote/attachkeyboard/AttachKeyboardManager.java
new file mode 100644
index 0000000..862e107
--- /dev/null
+++ b/src/com/fh/service/sunvote/attachkeyboard/AttachKeyboardManager.java
@@ -0,0 +1,61 @@
+package com.fh.service.sunvote.attachkeyboard;
+
+import java.util.List;
+
+import com.fh.entity.Page;
+import com.fh.util.PageData;
+
+/** 
+ * 说明： 班级附加键盘接口
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-25
+ * @version
+ */
+public interface AttachKeyboardManager{
+
+	/**新增
+	 * @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;
+	
+	public List<PageData> listAllClassId(PageData pd)throws Exception;
+	
+}
+
diff --git a/src/com/fh/service/sunvote/attachkeyboard/impl/AttachKeyboardService.java b/src/com/fh/service/sunvote/attachkeyboard/impl/AttachKeyboardService.java
new file mode 100644
index 0000000..924e581
--- /dev/null
+++ b/src/com/fh/service/sunvote/attachkeyboard/impl/AttachKeyboardService.java
@@ -0,0 +1,90 @@
+package com.fh.service.sunvote.attachkeyboard.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+import com.fh.dao.DaoSupport;
+import com.fh.entity.Page;
+import com.fh.util.PageData;
+import com.fh.service.sunvote.attachkeyboard.AttachKeyboardManager;
+
+/** 
+ * 说明： 班级附加键盘
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-25
+ * @version
+ */
+@Service("attachkeyboardService")
+public class AttachKeyboardService implements AttachKeyboardManager{
+
+	@Resource(name = "daoSupport")
+	private DaoSupport dao;
+	
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		dao.save("AttachKeyboardMapper.save", pd);
+	}
+	
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		dao.delete("AttachKeyboardMapper.delete", pd);
+	}
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		dao.update("AttachKeyboardMapper.edit", pd);
+	}
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> list(Page page)throws Exception{
+		return (List<PageData>)dao.findForList("AttachKeyboardMapper.datalistPage", page);
+	}
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("AttachKeyboardMapper.listAll", pd);
+	}
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAllClassId(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("AttachKeyboardMapper.listAllClassId", pd);
+	}
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("AttachKeyboardMapper.findById", pd);
+	}
+	
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		dao.delete("AttachKeyboardMapper.deleteAll", ArrayDATA_IDS);
+	}
+	
+}
+
diff --git a/src/com/fh/service/sunvote/event/EventManager.java b/src/com/fh/service/sunvote/event/EventManager.java
new file mode 100644
index 0000000..495ab81
--- /dev/null
+++ b/src/com/fh/service/sunvote/event/EventManager.java
@@ -0,0 +1,58 @@
+package com.fh.service.sunvote.event;
+
+import java.util.List;
+import com.fh.entity.Page;
+import com.fh.util.PageData;
+
+/** 
+ * 说明： 事件记录接口
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-26
+ * @version
+ */
+public interface EventManager{
+
+	/**新增
+	 * @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/event/impl/EventService.java b/src/com/fh/service/sunvote/event/impl/EventService.java
new file mode 100644
index 0000000..2286fac
--- /dev/null
+++ b/src/com/fh/service/sunvote/event/impl/EventService.java
@@ -0,0 +1,82 @@
+package com.fh.service.sunvote.event.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Service;
+import com.fh.dao.DaoSupport;
+import com.fh.entity.Page;
+import com.fh.util.PageData;
+import com.fh.service.sunvote.event.EventManager;
+
+/** 
+ * 说明： 事件记录
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-26
+ * @version
+ */
+@Service("eventService")
+public class EventService implements EventManager{
+
+	@Resource(name = "daoSupport")
+	private DaoSupport dao;
+	
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		dao.save("EventMapper.save", pd);
+	}
+	
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		dao.delete("EventMapper.delete", pd);
+	}
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		dao.update("EventMapper.edit", pd);
+	}
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> list(Page page)throws Exception{
+		return (List<PageData>)dao.findForList("EventMapper.datalistPage", page);
+	}
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("EventMapper.listAll", pd);
+	}
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("EventMapper.findById", pd);
+	}
+	
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		dao.delete("EventMapper.deleteAll", ArrayDATA_IDS);
+	}
+	
+}
+
--
libgit2 0.21.4