From 9338b5630d3c086ef998ed3f5a9f1d18ee4ba05d Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Fri, 29 Jun 2018 14:54:37 +0800
Subject: [PATCH] 添加报表

---
 WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_edit.jsp         | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_list.jsp         | 374 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp                            |  10 ++++++++--
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp                             |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp                         | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp                      | 211 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/WEB-INF/jsp/system/index/login.jsp                                       |  22 ++++++++--------------
 WebRoot/afterService/dt_info.html                                                |   1 +
 WebRoot/afterService/gsdt_info.html                                              |   1 +
 WebRoot/afterService/gsinfo.html                                                 |   1 +
 WebRoot/afterService/gsparts2_info.html                                          |   1 +
 WebRoot/afterService/gsparts_info.html                                           |   1 +
 WebRoot/afterService/info.html                                                   |   1 +
 WebRoot/afterService/parts2_info.html                                            |   1 +
 WebRoot/afterService/parts_info.html                                             |   1 +
 resources/mybatis1/sunvote/NetworkStatisticsMapper.xml                           | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 resources/mybatis1/sunvote/StudentMapper.xml                                     |  54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 resources/mybatis1/sunvote/StudentTestMapper.xml                                 |  29 +++++++++++++++++++++++++++++
 resources/mybatis1/sunvote/TestPaperMapper.xml                                   |  12 ++++++++++++
 src/com/fh/controller/api/V1.java                                                |  82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/sunvote/networkstatistics/NetworkStatisticsController.java | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/sunvote/report/ReportController.java                       | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/service/sunvote/networkstatistics/NetworkStatisticsManager.java       |  63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/service/sunvote/networkstatistics/impl/NetworkStatisticsService.java  |  90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/service/sunvote/student/StudentManager.java                           |  16 ++++++++++++++++
 src/com/fh/service/sunvote/student/impl/StudentService.java                      |  11 +++++++++++
 src/com/fh/service/sunvote/studenttest/StudentTestManager.java                   |   5 +++++
 src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java              |   8 ++++++++
 28 files changed, 1908 insertions(+), 17 deletions(-)
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_edit.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_list.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
 create mode 100644 resources/mybatis1/sunvote/NetworkStatisticsMapper.xml
 create mode 100644 src/com/fh/controller/sunvote/networkstatistics/NetworkStatisticsController.java
 create mode 100644 src/com/fh/controller/sunvote/report/ReportController.java
 create mode 100644 src/com/fh/service/sunvote/networkstatistics/NetworkStatisticsManager.java
 create mode 100644 src/com/fh/service/sunvote/networkstatistics/impl/NetworkStatisticsService.java

diff --git a/WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_edit.jsp
new file mode 100644
index 0000000..86cb155
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_edit.jsp
@@ -0,0 +1,164 @@
+<%@ 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="networkstatistics/${msg }.do" name="Form" id="Form" method="post">
+						<input type="hidden" name="NETWORKSTATISTICS_ID" id="NETWORKSTATISTICS_ID" value="${pd.NETWORKSTATISTICS_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;">客户端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="CLIENT_IP" id="CLIENT_IP" value="${pd.CLIENT_IP}" maxlength="255" placeholder="这里输入客户端IP" title="客户端IP" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">成功次数:</td>
+								<td><input type="text" name="SUCCESS_COUNT" id="SUCCESS_COUNT" value="${pd.SUCCESS_COUNT}" 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="FAIL_COUNT" id="FAIL_COUNT" value="${pd.FAIL_COUNT}" 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="SESSION_ID" id="SESSION_ID" value="${pd.SESSION_ID}" 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="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入备注" title="备注" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="text-align: center;" colspan="10">
+									<a class="btn btn-mini btn-primary" onclick="save();">保存</a>
+									<a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
+								</td>
+							</tr>
+						</table>
+						</div>
+						<div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
+					</form>
+					</div>
+					<!-- /.col -->
+				</div>
+				<!-- /.row -->
+			</div>
+			<!-- /.page-content -->
+		</div>
+	</div>
+	<!-- /.main-content -->
+</div>
+<!-- /.main-container -->
+
+
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot.jsp"%>
+	<!-- 下拉框 -->
+	<script src="static/ace/js/chosen.jquery.js"></script>
+	<!-- 日期框 -->
+	<script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
+	<!--提示框-->
+	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+		<script type="text/javascript">
+		$(top.hangge());
+		//保存
+		function save(){
+			if($("#CLIENT_ID").val()==""){
+				$("#CLIENT_ID").tips({
+					side:3,
+		            msg:'请输入客户端ID',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#CLIENT_ID").focus();
+			return false;
+			}
+			if($("#CLIENT_IP").val()==""){
+				$("#CLIENT_IP").tips({
+					side:3,
+		            msg:'请输入客户端IP',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#CLIENT_IP").focus();
+			return false;
+			}
+			if($("#SUCCESS_COUNT").val()==""){
+				$("#SUCCESS_COUNT").tips({
+					side:3,
+		            msg:'请输入成功次数',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SUCCESS_COUNT").focus();
+			return false;
+			}
+			if($("#FAIL_COUNT").val()==""){
+				$("#FAIL_COUNT").tips({
+					side:3,
+		            msg:'请输入失败次数',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#FAIL_COUNT").focus();
+			return false;
+			}
+			if($("#SESSION_ID").val()==""){
+				$("#SESSION_ID").tips({
+					side:3,
+		            msg:'请输入会话',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SESSION_ID").focus();
+			return false;
+			}
+			if($("#REMARK").val()==""){
+				$("#REMARK").tips({
+					side:3,
+		            msg:'请输入备注',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#REMARK").focus();
+			return false;
+			}
+			$("#Form").submit();
+			$("#zhongxin").hide();
+			$("#zhongxin2").show();
+		}
+		
+		$(function() {
+			//日期框
+			$('.date-picker').datepicker({autoclose: true,todayHighlight: true});
+		});
+		</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_list.jsp
new file mode 100644
index 0000000..9b4a4fd
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/networkstatistics/networkstatistics_list.jsp
@@ -0,0 +1,374 @@
+<%@ 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="networkstatistics/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">客户端ID</th>
+									<th class="center">客户端IP</th>
+									<th class="center">成功次数</th>
+									<th class="center">失败次数</th>
+									<th class="center">会话</th>
+									<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.NETWORKSTATISTICS_ID}" class="ace" /><span class="lbl"></span></label>
+											</td>
+											<td class='center' style="width: 30px;">${vs.index+1}</td>
+											<td class='center'>${var.CLIENT_ID}</td>
+											<td class='center'>${var.CLIENT_IP}</td>
+											<td class='center'>${var.SUCCESS_COUNT}</td>
+											<td class='center'>${var.FAIL_COUNT}</td>
+											<td class='center'>${var.SESSION_ID}</td>
+											<td class='center'>${var.REMARK}</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.NETWORKSTATISTICS_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.NETWORKSTATISTICS_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.NETWORKSTATISTICS_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.NETWORKSTATISTICS_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%>networkstatistics/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%>networkstatistics/delete.do?NETWORKSTATISTICS_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%>networkstatistics/goEdit.do?NETWORKSTATISTICS_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%>networkstatistics/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%>networkstatistics/excel.do';
+		}
+	</script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
index 78299d0..f13b38a 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -35,6 +35,7 @@
 						<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}"/>
 						<table style="margin-top:5px;">
 							<tr>
+								<th class="center" style="float:right"><a href="javascript:;">查看成绩报表</a></th>
 							</tr>
 						</table>
 						<!-- 检索  -->
@@ -66,7 +67,7 @@
 											</td>
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
 											<td class='center'>${var.NAME}</td>
-											<td class='center'>${var.SEX == 1 ? "男":"女"}</td>
+											<td class='center'>${var.SEX == 1 ? "男":var.SEX == 0 ?"女":"未知"}</td>
 											<td class='center'>${var.GROUPID}</td>
 											<td class='center'>${var.SIGN_NO}</td>
 											<td class='center'>${var.KEYPAD_ID}</td>
@@ -104,6 +105,7 @@
 									<a class="btn btn-mini btn-success" onclick="add();">新增</a>
 									<a class="btn btn-mini btn-success" onclick="upload();">批量上传</a>
 									<a class="btn btn-mini btn-danger" onclick="makeAll('确定要删除选中的数据吗?');" title="批量删除" ><i class='ace-icon fa fa-trash-o bigger-120'></i></a>
+									<a class="btn btn-mini btn-success" onclick="report();">查看班级报表</a>
 								</td>
 								<td style="vertical-align:top;"><div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div></td>
 							</tr>
@@ -125,7 +127,7 @@
 		<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 -->
 
@@ -323,6 +325,10 @@
 			});
 		};
 		
+		function report(){
+			window.open('<%=basePath%>report/report.do?classid=${pd.CLASS_ID}');
+		}
+		
 		//导出excel
 		function toExcel(){
 			window.location.href='<%=basePath%>student/excel.do';
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 5ad0973..1b2a223 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -77,7 +77,7 @@
 	<!-- 页面顶部¨ -->
 	
 
-	<div style="width:1200px;margin:0 auto;">
+	<div style="width:1360px;margin:0 auto;">
 	<%@ include file="../../system/index/head.jsp"%>
 	<div class="content_l">
 	
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
new file mode 100644
index 0000000..c089498
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -0,0 +1,221 @@
+<%@ 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 PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<base href="<%=basePath%>">
+
+<title>${info.CLASS_NAME}成绩报表</title>
+<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 style="background:#fff">
+	<div style="min-width:1360px;margin:0 100">
+	</br></br>
+		<form action="report/report.do" method="post" name="Form" id="Form">
+			<input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
+			<table style="margin-top:5px;">
+				<tr>
+					<td>课程统计: ${info.testsize}</td>
+				</tr>
+				<tr>
+					<td>班级名册: ${info.CLASS_NAME}</td>
+				</tr>
+				<tr>
+					<td><span>学生人数: ${info.STUDENT_NUM}</span></td>
+					<td></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" id="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"><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>
+				</tr>
+			</table>
+			<table id="simple-table"
+				class="table table-striped table-bordered table-hover"
+				style="margin-top:5px;">
+				<thead>
+					<tr>
+						<th class="center">姓名</th>
+						<th class="center">课程平均得分率</th>
+						<th class="center">课程总分</th>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<th class="center"><a
+								href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}">${var.NAME}(${var.CREATE_DATE})</a></th>
+						</c:forEach>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td class="center">班级课程总分</td>
+						<td class="center"></td>
+						<td class="center"></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center">${var.TOTAL_SCORE}</td>
+						</c:forEach>
+					</tr>
+					<tr>
+						<td class="center">班级课程平均分</td>
+						<td class="center"></td>
+						<td class="center"></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center">${var.AVG_SCORE}</td>
+						</c:forEach>
+					</tr>
+					<tr>
+						<td class="center">班级课程平均得分率</td>
+						<td class="center"></td>
+						<td class="center"></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center"><fmt:formatNumber type="number"
+									value="${var.TOTAL_SCORE == 0 ? 0: (var.AVG_SCORE / var.TOTAL_SCORE * 100)}"
+									maxFractionDigits="1" />%</td>
+						</c:forEach>
+					</tr>
+
+					<c:choose>
+						<c:when test="${not empty studentList}">
+							<c:forEach items="${studentList}" var="var" varStatus="vs">
+								<tr>
+									<td class="center"><a
+										href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
+									</td>
+									<td class="center"><fmt:formatNumber type="number"
+											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
+											maxFractionDigits="1" />%</td>
+									<td class="center">${var.GETSCORE }</td>
+									<c:forEach items="${testpaperList}" var="var1" varStatus="vs1">
+										<td class="center"><c:set var="TEST_ID"
+												value="${var1.TESTPAPER_ID}" /> ${var[TEST_ID] }</td>
+									</c:forEach>
+								</tr>
+							</c:forEach>
+						</c:when>
+					</c:choose>
+				</tbody>
+			</table>
+		</form>
+	</div>
+
+	<%@ 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">
+		$(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 precent(avg,total){
+			if(total == 0){
+				return "0%"
+			}
+			return Math.round(avg / total * 100)/100 + '%' ;
+		}
+		
+		function tosearch(){
+			var url = "<%=basePath%>report/report.do?classid=${info.CLASS_ID}" ;
+			var startDate = $("#lastStart").val();
+			var endDate =  $("#lastEnd").val();
+			url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
+			window.location.href = url;
+			/* $("#Form").sumbit(); */
+		}
+	</script>
+
+</body>
+</html>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
new file mode 100644
index 0000000..e5f8e18
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
@@ -0,0 +1,211 @@
+<%@ 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 PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<base href="<%=basePath%>">
+
+<title>成绩报表</title>
+<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 style="background:#fff">
+	<div style="min-width:1360px;">
+		<form action="report/report_test.do" method="post" name="Form" id="Form">
+			<input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
+			<table style="margin-top:5px;">
+				<tr>
+					<td>课程统计: ${info.testsize}</td>
+				</tr>
+				<tr>
+					<td>班级名册: ${info.CLASS_NAME}</td>
+				</tr>
+				<tr>
+					<td><span>学生人数: ${info.STUDENT_NUM}</span></td>
+					<td></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"><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>
+				</tr>
+			</table>
+			<table id="simple-table"
+				class="table table-striped table-bordered table-hover"
+				style="margin-top:5px;">
+				<thead>
+					<tr>
+						<th class="center">姓名</th>
+						<th class="center">课程平均得分率</th>
+						<th class="center">课程总分</th>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<th class="center"><a
+								href="report/test_report?TestID=${var.TESTPAPER_ID}&class_id=${info.CLASS_ID}">${var.NAME}</a></th>
+						</c:forEach>
+					</tr>
+				</thead>
+				<tbody>
+					<tr>
+						<td class="center">班级课程总分</td>
+						<td class="center"></td>
+						<td class="center"></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center">${var.TOTAL_SCORE}</td>
+						</c:forEach>
+					</tr>
+					<tr>
+						<td class="center">班级课程平均分</td>
+						<td class="center"></td>
+						<td class="center"></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center">${var.AVG_SCORE}</td>
+						</c:forEach>
+					</tr>
+					<tr>
+						<td class="center">班级课程平均得分率</td>
+						<td class="center"></td>
+						<td class="center"></td>
+						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
+							<td class="center"><fmt:formatNumber type="number"
+									value="${var.TOTAL_SCORE == 0 ? 0: (var.AVG_SCORE / var.TOTAL_SCORE * 100)}"
+									maxFractionDigits="1" />%</td>
+						</c:forEach>
+					</tr>
+
+					<c:choose>
+						<c:when test="${not empty studentList}">
+							<c:forEach items="${studentList}" var="var" varStatus="vs">
+								<tr>
+									<td class="center"><a
+										href="<%=basePath%>report/student_report?studentid=${var.ID}">${var.NAME}</a>
+									</td>
+									<td class="center"><fmt:formatNumber type="number"
+											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
+											maxFractionDigits="1" />%</td>
+									<td class="center">${var.GETSCORE }</td>
+									<c:forEach items="${testpaperList}" var="var1" varStatus="vs1">
+										<td class="center"><c:set var="TEST_ID"
+												value="${var1.TESTPAPER_ID}" /> ${var[TEST_ID] }</td>
+									</c:forEach>
+								</tr>
+							</c:forEach>
+						</c:when>
+					</c:choose>
+				</tbody>
+			</table>
+		</form>
+	</div>
+
+	<%@ 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">
+		$(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 precent(avg,total){
+			if(total == 0){
+				return "0%"
+			}
+			return Math.round(avg / total * 100)/100 + '%' ;
+		}
+	</script>
+
+</body>
+</html>
diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp
index 3ba2fad..ea898d5 100644
--- a/WebRoot/WEB-INF/jsp/system/index/login.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp
@@ -44,7 +44,7 @@
 		function showfh(){
 			fhi = 1;
 			//关闭提示晃动屏幕，注释掉这句话即可
-			timer = setInterval(xzfh2, 10); 
+			//timer = setInterval(xzfh2, 10); 
 		};
 		var current = 0;
 		function xzfh(){
@@ -70,13 +70,7 @@
 	</script>
 </head>
 <body>
-
-	<c:if test="${pd.isMusic == 'yes' }">
-	<div style="display: none">
-	    <audio src="static/login/music/fh1.mp3" autoplay=""></audio>
-	</div>	
-	</c:if>
-	<canvas class="cavs"></canvas>
+	
 	<div style="width:100%;text-align: center;margin: 0 auto;position: absolute;">
 		<!-- 登录 -->
 		<div id="windows1">
@@ -136,7 +130,7 @@
 			</form>
 			<div class="controls">
 				<div class="main_input_box">
-					<font color="white"><span id="nameerr">Copyright 中天电子（需备案）</span></font>
+					<font><span id="nameerr">Copyright 中天电子（需备案）</span></font>
 				</div>
 			</div>
 		</div>
@@ -215,14 +209,14 @@
 			</form>
 			<div class="controls">
 				<div class="main_input_box">
-					<font color="white"><span id="nameerr">Copyright © FHqq313596790 2100</span></font>
+					<font ><span id="nameerr">Copyright © FHqq313596790 2100</span></font>
 				</div>
 			</div>
 		</div>
 		</div>
 		
 	</div>
-	<div id="templatemo_banner_slide" class="container_wapper">
+	<%-- <div id="templatemo_banner_slide" class="container_wapper">
 		<div class="camera_wrap camera_emboss" id="camera_slide">
 			<!-- 背景图片 -->
 			<c:choose>
@@ -233,15 +227,15 @@
 				</c:when>
 				<c:otherwise>
 					 <div data-src="static/login/images/banner_slide_02.jpg"></div>
-					<!--<div data-src="static/login/images/banner_slide_01.jpg"></div>
+					<div data-src="static/login/images/banner_slide_01.jpg"></div>
 					<div data-src="static/login/images/banner_slide_03.jpg"></div>
 					<div data-src="static/login/images/banner_slide_04.jpg"></div>
-					<div data-src="static/login/images/banner_slide_05.jpg"></div> -->
+					<div data-src="static/login/images/banner_slide_05.jpg"></div> 
 				</c:otherwise>
 			</c:choose>
 		</div>
 		<!-- #camera_wrap_3 -->
-	</div>
+	</div> --%>
 
 	<script type="text/javascript">
 		//服务器校验
diff --git a/WebRoot/afterService/dt_info.html b/WebRoot/afterService/dt_info.html
index 218328e..523a47f 100644
--- a/WebRoot/afterService/dt_info.html
+++ b/WebRoot/afterService/dt_info.html
@@ -353,6 +353,7 @@
 				data:data,
 				success:function(data){
 					alert("提交成功！");
+					window.location.reload();
 				}
 			})
 		}
diff --git a/WebRoot/afterService/gsdt_info.html b/WebRoot/afterService/gsdt_info.html
index e1877a8..871217e 100644
--- a/WebRoot/afterService/gsdt_info.html
+++ b/WebRoot/afterService/gsdt_info.html
@@ -333,6 +333,7 @@
 				data:data,
 				success:function(data){
 					alert("提交成功！");
+					window.location.reload();
 				}
 			})
 		}
diff --git a/WebRoot/afterService/gsinfo.html b/WebRoot/afterService/gsinfo.html
index 1a53d22..24f8aeb 100644
--- a/WebRoot/afterService/gsinfo.html
+++ b/WebRoot/afterService/gsinfo.html
@@ -345,6 +345,7 @@ PS：建议老师使用手动连接的方式，不要选择自动连接。</p>
 				data:data,
 				success:function(data){
 					alert("提交成功！");
+					window.location.reload();
 				}
 			})
 		}
diff --git a/WebRoot/afterService/gsparts2_info.html b/WebRoot/afterService/gsparts2_info.html
index 7d3efbf..f444d84 100644
--- a/WebRoot/afterService/gsparts2_info.html
+++ b/WebRoot/afterService/gsparts2_info.html
@@ -253,6 +253,7 @@
 				data:data,
 				success:function(data){
 					alert("提交成功！");
+					window.location.reload();
 				}
 			})
 		}
diff --git a/WebRoot/afterService/gsparts_info.html b/WebRoot/afterService/gsparts_info.html
index f2ba46b..62a10a4 100644
--- a/WebRoot/afterService/gsparts_info.html
+++ b/WebRoot/afterService/gsparts_info.html
@@ -255,6 +255,7 @@
 				data:data,
 				success:function(data){
 					alert("提交成功！");
+					window.location.reload();
 				}
 			})
 		}
diff --git a/WebRoot/afterService/info.html b/WebRoot/afterService/info.html
index 58895c3..f89c978 100644
--- a/WebRoot/afterService/info.html
+++ b/WebRoot/afterService/info.html
@@ -349,6 +349,7 @@ PS：建议老师使用手动连接的方式，不要选择自动连接。</p>
 				data:data,
 				success:function(data){
 					alert("提交成功！");
+					window.location.reload();
 				}
 			})
 		}
diff --git a/WebRoot/afterService/parts2_info.html b/WebRoot/afterService/parts2_info.html
index 284f3cd..744ee98 100644
--- a/WebRoot/afterService/parts2_info.html
+++ b/WebRoot/afterService/parts2_info.html
@@ -251,6 +251,7 @@
 				data:data,
 				success:function(data){
 					alert("提交成功！");
+					window.location.reload();
 				}
 			})
 		}
diff --git a/WebRoot/afterService/parts_info.html b/WebRoot/afterService/parts_info.html
index 42a5f2c..8019902 100644
--- a/WebRoot/afterService/parts_info.html
+++ b/WebRoot/afterService/parts_info.html
@@ -253,6 +253,7 @@
 				data:data,
 				success:function(data){
 					alert("提交成功！");
+					window.location.reload();
 				}
 			})
 		}
diff --git a/resources/mybatis1/sunvote/NetworkStatisticsMapper.xml b/resources/mybatis1/sunvote/NetworkStatisticsMapper.xml
new file mode 100644
index 0000000..0bf815c
--- /dev/null
+++ b/resources/mybatis1/sunvote/NetworkStatisticsMapper.xml
@@ -0,0 +1,132 @@
+<?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="NetworkStatisticsMapper">
+	
+	<!--表名 -->
+	<sql id="tableName">
+		SV_NETWORKSTATISTICS
+	</sql>
+	
+	<!-- 字段 -->
+	<sql id="Field">
+		CLIENT_ID,	
+		CLIENT_IP,	
+		SUCCESS_COUNT,	
+		FAIL_COUNT,	
+		SESSION_ID,	
+		REMARK,	
+		NETWORKSTATISTICS_ID
+	</sql>
+	
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{CLIENT_ID},	
+		#{CLIENT_IP},	
+		#{SUCCESS_COUNT},	
+		#{FAIL_COUNT},	
+		#{SESSION_ID},	
+		#{REMARK},	
+		#{NETWORKSTATISTICS_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 
+			NETWORKSTATISTICS_ID = #{NETWORKSTATISTICS_ID}
+	</delete>
+	
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set 
+			CLIENT_ID = #{CLIENT_ID},
+			CLIENT_IP = #{CLIENT_IP},
+			SUCCESS_COUNT = #{SUCCESS_COUNT},
+			FAIL_COUNT = #{FAIL_COUNT},
+			SESSION_ID = #{SESSION_ID},
+			REMARK = #{REMARK},
+		NETWORKSTATISTICS_ID = NETWORKSTATISTICS_ID
+		where 
+		NETWORKSTATISTICS_ID = #{NETWORKSTATISTICS_ID}
+	</update>
+	
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			NETWORKSTATISTICS_ID = #{NETWORKSTATISTICS_ID}
+	</select>
+	
+	<select id="findByClientID" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 1 =1 
+		<if test="CLIENT_ID != null and CLIENT_ID != ''"><!-- 关键词检索 -->
+			and CLIENT_ID = #{CLIENT_ID}
+		</if>
+		<if test="CLIENT_ID != null and CLIENT_ID != ''"><!-- 关键词检索 -->
+			and SESSION_ID = #{SESSION_ID}
+		</if>
+		
+		limit 1 
+	</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 
+			NETWORKSTATISTICS_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/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml
index 6ed2fd2..ec01067 100644
--- a/resources/mybatis1/sunvote/StudentMapper.xml
+++ b/resources/mybatis1/sunvote/StudentMapper.xml
@@ -149,6 +149,60 @@
 		order by sv_student.SNO
 	</select>
 	
+	<!-- 列表(全部) -->
+	<select id="listAllClass" parameterType="pd" resultType="pd">
+		select
+			sv_student.`NAME`,
+			sv_student.SNO,
+			sv_student.NUMBER,
+			sv_student.SEX,
+			sv_student.GROUPID,
+			sv_student.SIGN_NO,
+			sv_student.PARENT_NAME,
+			sv_student.PARENT_PHONE,
+			sv_student.KEYPAD_ID,
+			sv_student.REMARK,
+			sv_student.ID
+		from sv_student
+		LEFT JOIN sv_classroster cr ON sv_student.ID = cr.STUDENT_ID
+		LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID
+		WHERE
+			1 = 1
+		AND sv_term.START_DATE &lt; NOW()
+		AND sv_term.END_DATE &gt; NOW()
+		<if test="CLASS_ID!= null and CLASS_ID != ''"><!-- 关键词检索 -->
+			AND cr.SCLASS_ID = #{CLASS_ID}
+		</if>
+		order by sv_student.SNO
+	</select>
+	<!-- 列表(全部) -->
+	<select id="listAllClassByTerm" parameterType="pd" resultType="pd">
+		select
+			sv_student.`NAME`,
+			sv_student.SNO,
+			sv_student.NUMBER,
+			sv_student.SEX,
+			sv_student.GROUPID,
+			sv_student.SIGN_NO,
+			sv_student.PARENT_NAME,
+			sv_student.PARENT_PHONE,
+			sv_student.KEYPAD_ID,
+			sv_student.REMARK,
+			sv_student.ID
+		from sv_student
+		LEFT JOIN sv_classroster cr ON sv_student.ID = cr.STUDENT_ID
+		LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID
+		WHERE
+			1 = 1
+		<if test="pd.TERM_ID != null and pd.TERM_ID != ''"><!-- 关键词检索 -->
+			AND sv_term.TERM_ID = #{pd.TERM_ID}
+		</if>
+		<if test="pd.CLASS_ID!= null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
+			AND cr.SCLASS_ID = #{pd.CLASS_ID}
+		</if>
+		order by sv_student.SNO
+	</select>
+	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
 		delete from
diff --git a/resources/mybatis1/sunvote/StudentTestMapper.xml b/resources/mybatis1/sunvote/StudentTestMapper.xml
index 28e077f..48f2b52 100644
--- a/resources/mybatis1/sunvote/StudentTestMapper.xml
+++ b/resources/mybatis1/sunvote/StudentTestMapper.xml
@@ -126,6 +126,35 @@
 		<if test="STUDENT_ID != null and STUDENT_ID != ''"><!-- 关键词检索 -->
 			and (STUDENT_ID = #{STUDENT_ID})
 		</if>
+		
+	</select>
+	
+	
+	<select id="reportListData"  parameterType="pd" resultType="pd">
+	
+		SELECT
+		`NAME` AS NAME,
+		sv_studenttest.SCORE AS SCORE,
+		sv_testpaper.TOTAL_SCORE AS TOTAL_SCORE,
+		CREATE_DATE,
+		sv_studenttest.STUDENT_ID AS STUDENT_ID
+		FROM
+			sv_testpaper
+		LEFT JOIN sv_studenttest ON sv_testpaper.TESTPAPER_ID = sv_studenttest.TEST_ID
+		WHERE 1 = 1 
+		<if test="STUDENT_ID != null and STUDENT_ID != ''">
+			and sv_studenttest.STUDENT_ID = #{STUDENT_ID}
+		</if>
+		<if test="START_DATE != null and START_DATE != ''"><!-- 关键词检索 -->
+			and (CREATE_DATE &gt; #{START_DATE})
+		</if>
+		<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
+			and (CREATE_DATE &lt; #{END_DATE})
+		</if>
+		
+		order by CREATE_DATE
+		
+		
 	</select>
 	
 	<!-- 批量删除 -->
diff --git a/resources/mybatis1/sunvote/TestPaperMapper.xml b/resources/mybatis1/sunvote/TestPaperMapper.xml
index ad962e0..9a116c3 100644
--- a/resources/mybatis1/sunvote/TestPaperMapper.xml
+++ b/resources/mybatis1/sunvote/TestPaperMapper.xml
@@ -20,6 +20,7 @@
 		HIGHT_SCORE,	
 		LOW_SCORE,	
 		AVG_SCORE,	
+		TOTAL_SCORE,	
 		REMARK,	
 		TESTPAPER_ID
 	</sql>
@@ -37,6 +38,7 @@
 		#{HIGHT_SCORE},	
 		#{LOW_SCORE},	
 		#{AVG_SCORE},	
+		#{TOTAL_SCORE},	
 		#{REMARK},	
 		#{TESTPAPER_ID}
 	</sql>
@@ -76,6 +78,7 @@
 			HIGHT_SCORE = #{HIGHT_SCORE},
 			LOW_SCORE = #{LOW_SCORE},
 			AVG_SCORE = #{AVG_SCORE},
+			TOTAL_SCORE = #{TOTAL_SCORE},
 			REMARK = #{REMARK},
 		TESTPAPER_ID = TESTPAPER_ID
 		where 
@@ -109,6 +112,8 @@
 				-->
 				)
 		</if>
+		
+		order by CREATE_DATE
 	</select>
 	
 	<!-- 列表(全部) -->
@@ -135,7 +140,14 @@
 		<if test="NAME != null and NAME != ''"><!-- 关键词检索 -->
 			and (NAME = #{NAME})
 		</if>
+		<if test="START_DATE != null and START_DATE != ''"><!-- 关键词检索 -->
+			and (CREATE_DATE &gt; #{START_DATE})
+		</if>
+		<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
+			and (CREATE_DATE &lt; #{END_DATE})
+		</if>
 		
+		order by CREATE_DATE
 	</select>
 	
 	<!-- 批量删除 -->
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 148233b..efae636 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -31,11 +31,13 @@ import com.fh.service.sunvote.classbasetation.ClassBasetationManager;
 import com.fh.service.sunvote.classroster.ClassRosterManager;
 import com.fh.service.sunvote.classtype.ClassTypeManager;
 import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
+import com.fh.service.sunvote.event.EventManager;
 import com.fh.service.sunvote.grade.GradeManager;
 import com.fh.service.sunvote.keypad.KeypadManager;
 import com.fh.service.sunvote.keypadcheck.KeypadCheckManager;
 import com.fh.service.sunvote.knowledge.KnowledgeManager;
 import com.fh.service.sunvote.knowledgechapter.KnowledgeChapterManager;
+import com.fh.service.sunvote.networkstatistics.NetworkStatisticsManager;
 import com.fh.service.sunvote.paper.PaperManager;
 import com.fh.service.sunvote.paperclassteacher.PaperClassTeacherManager;
 import com.fh.service.sunvote.paperquestion.PaperQuestionManager;
@@ -150,6 +152,12 @@ public class V1 extends BaseController {
 	
 	@Resource(name="attachkeyboardService")
 	private AttachKeyboardManager attachkeyboardService;
+	
+	@Resource(name="networkstatisticsService")
+	private NetworkStatisticsManager networkstatisticsService;
+	
+	@Resource(name="eventService")
+	private EventManager eventService;
 
 	@RequestMapping(value = "/login", produces = "application/json;charset=UTF-8")
 	@ResponseBody
@@ -178,6 +186,20 @@ public class V1 extends BaseController {
 				pageData.put("subjectList", subjectList);
 
 				pageData.remove("SUBJECT_IDS");
+				
+				PageData eventPd = new PageData();
+				eventPd.put("EVENT_ID", get32UUID());
+				eventPd.put("EVENT_NAME", "login");
+				eventPd.put("EVENT_USER", pageData.getString("ID"));
+				eventPd.put("EVENT_TYPE", "0");
+				eventPd.put("EVENT_START_TIME",Tools.date2Str(new Date()));
+				if(pd.getString("CLIENT_ID") != null){
+					eventPd.put("CLIENT_ID", pd.getString("CLIENT_ID"));
+				}else{
+					eventPd.put("CLIENT_ID", "CLIENT");
+				}
+				eventPd.put("EVENT_IP",getRemoteIp());
+				eventService.save(eventPd);
 
 				res.setData(pageData);
 				// 填充数据到返回数据中
@@ -968,6 +990,66 @@ public class V1 extends BaseController {
 		this.getUserID();
 	}
 	
+	
+	@RequestMapping(value = "/network", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object network() throws Exception{
+		PageData pd = this.getPageData();
+		ResponseGson<PageData> res = new ResponseGson();
+		PageData spd = networkstatisticsService.findByClientID(pd);
+		String seqStr = pd.getString("SEQ");
+		if (seqStr != null && pd.getString("CLIENT_ID") != null
+				&& pd.getString("SESSION_ID") != null) {
+			int seq = Integer.parseInt(seqStr);
+			if (spd != null) {
+				int successCount = Integer.parseInt(spd
+						.getString("SUCCESS_COUNT"));
+				spd.put("SUCCESS_COUNT", ++successCount + "");
+				int fail = seq - successCount;
+				if(fail < 0 ){
+					fail = 0;
+				}
+				spd.put("FAIL_COUNT", fail + "");
+				networkstatisticsService.edit(spd);
+				spd.remove("NETWORKSTATISTICS_ID");
+				spd.remove("CLIENT_ID");
+				spd.remove("SESSION_ID");
+				res.setData(spd);
+			} else {
+				pd.put("NETWORKSTATISTICS_ID", get32UUID());
+				pd.put("SUCCESS_COUNT", "1");
+				pd.put("CLIENT_IP", getRemoteIp());
+				int fail = seq - 1;
+				if(fail < 0 ){
+					fail = 0;
+				}
+				pd.put("FAIL_COUNT", fail + "");
+				networkstatisticsService.save(pd);
+				pd.remove("JSON");
+				pd.remove("CLIENT_ID");
+				pd.remove("SESSION_ID");
+				pd.remove("SEQ");
+				pd.remove("NETWORKSTATISTICS_ID");
+				res.setData(pd);
+			}
+		}else{
+			res.setDataError();
+		}
+		return res.toJson();
+	}
+	
+	
+	public String getRemoteIp(){
+		HttpServletRequest request = getRequest();
+		String ip = "";
+		if (request.getHeader("x-forwarded-for") == null) {
+			ip = request.getRemoteAddr();
+		} else {
+			ip = request.getHeader("x-forwarded-for");
+		}
+		return ip;
+	}
+	
 	@RequestMapping(value = "/newversion", produces = "application/json;charset=UTF-8")
 	@ResponseBody
 	public Object getNewVersion(HttpServletRequest request) throws Exception{
diff --git a/src/com/fh/controller/sunvote/networkstatistics/NetworkStatisticsController.java b/src/com/fh/controller/sunvote/networkstatistics/NetworkStatisticsController.java
new file mode 100644
index 0000000..45f5e82
--- /dev/null
+++ b/src/com/fh/controller/sunvote/networkstatistics/NetworkStatisticsController.java
@@ -0,0 +1,215 @@
+package com.fh.controller.sunvote.networkstatistics;
+
+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.networkstatistics.NetworkStatisticsManager;
+
+/** 
+ * 说明：网络统计
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-26
+ */
+@Controller
+@RequestMapping(value="/networkstatistics")
+public class NetworkStatisticsController extends BaseController {
+	
+	String menuUrl = "networkstatistics/list.do"; //菜单地址(权限用)
+	@Resource(name="networkstatisticsService")
+	private NetworkStatisticsManager networkstatisticsService;
+	
+	/**保存
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/save")
+	public ModelAndView save() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"新增NetworkStatistics");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("NETWORKSTATISTICS_ID", this.get32UUID());	//主键
+		networkstatisticsService.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()+"删除NetworkStatistics");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		networkstatisticsService.delete(pd);
+		out.write("success");
+		out.close();
+	}
+	
+	/**修改
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/edit")
+	public ModelAndView edit() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"修改NetworkStatistics");
+		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		networkstatisticsService.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()+"列表NetworkStatistics");
+		//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 = networkstatisticsService.list(page);	//列出NetworkStatistics列表
+		mv.setViewName("sunvote/networkstatistics/networkstatistics_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/networkstatistics/networkstatistics_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 = networkstatisticsService.findById(pd);	//根据ID读取
+		mv.setViewName("sunvote/networkstatistics/networkstatistics_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()+"批量删除NetworkStatistics");
+		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(",");
+			networkstatisticsService.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()+"导出NetworkStatistics到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("客户端IP");	//2
+		titles.add("成功次数");	//3
+		titles.add("失败次数");	//4
+		titles.add("会话");	//5
+		titles.add("备注");	//6
+		dataMap.put("titles", titles);
+		List<PageData> varOList = networkstatisticsService.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("CLIENT_ID"));	    //1
+			vpd.put("var2", varOList.get(i).getString("CLIENT_IP"));	    //2
+			vpd.put("var3", varOList.get(i).getString("SUCCESS_COUNT"));	    //3
+			vpd.put("var4", varOList.get(i).getString("FAIL_COUNT"));	    //4
+			vpd.put("var5", varOList.get(i).getString("SESSION_ID"));	    //5
+			vpd.put("var6", varOList.get(i).getString("REMARK"));	    //6
+			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/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
new file mode 100644
index 0000000..892f53a
--- /dev/null
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -0,0 +1,196 @@
+package com.fh.controller.sunvote.report;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import com.fh.controller.api.ResponseGson;
+import com.fh.controller.base.BaseController;
+import com.fh.service.sunvote.sclass.SClassManager;
+import com.fh.service.sunvote.student.StudentManager;
+import com.fh.service.sunvote.studenttest.StudentTestManager;
+import com.fh.service.sunvote.testpaper.TestPaperManager;
+import com.fh.util.Jurisdiction;
+import com.fh.util.PageData;
+
+@Controller
+@RequestMapping(value="/report")
+public class ReportController extends BaseController {
+	
+	@Resource(name="sclassService")
+	private SClassManager sclassService;
+	
+	@Resource(name="studentService")
+	private StudentManager studentService;
+	
+	@Resource(name="testpaperService")
+	private TestPaperManager testpaperService;
+	
+	@Resource(name="studenttestService")
+	private StudentTestManager studenttestService;
+	
+	
+
+	@RequestMapping(value="/report")
+	public ModelAndView report() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"班级报表");
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = getPageData();
+		pd.put("SCLASS_ID", pd.get("CLASSID"));
+		pd.put("ID", pd.get("CLASSID"));
+		// 1 查询班级信息
+		PageData classPageData = sclassService.findById(pd);
+		PageData info = new PageData();
+		info.put("CLASS_NAME", classPageData.getString("CLASS_NAME"));
+		info.put("CLASS_CODE", classPageData.getString("CLASS_CODE"));
+		info.put("CLASS_ID", classPageData.getString("ID"));
+		pd.put("CLASS_ID", pd.get("CLASSID"));
+		List<PageData> studentList = studentService.listAllClass(pd);
+		// 2查询班级考试
+		List<PageData> testpaperList = testpaperService.listAll(pd);
+		mv.addObject("testpaperList", testpaperList);
+		info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
+		// 查询学生名单及人数
+		if(studentList != null && studentList.size() > 0){
+			for(PageData studentPageData : studentList){
+				studentPageData.put("STUDENT_ID", studentPageData.getString("ID"));
+				List<PageData> studentTestList = studenttestService.listAll(studentPageData);
+				for(PageData studentTestPageData :studentTestList){
+					studentPageData.put(studentTestPageData.getString("TEST_ID"), studentTestPageData.getString("SCORE"));
+				}
+				int totalScore = 0 ;
+				int getScore = 0 ;
+				for(PageData testPaperPageData:testpaperList){
+					String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
+					if(totalScoreStr != null){
+						try{
+							totalScore += Integer.parseInt(totalScoreStr);
+						}catch(Exception ex){
+							logger.info(ex);
+						}
+					}
+					String getScoreStr = studentPageData.getString(testPaperPageData.getString("TESTPAPER_ID"));
+					if(getScoreStr != null){
+						try{
+							getScore += Integer.parseInt(getScoreStr);
+						}catch(Exception ex){
+							logger.info(ex);
+						}
+					}
+				}
+				studentPageData.put("TOTALSCORE", totalScore);
+				studentPageData.put("GETSCORE", getScore);
+				
+			}
+		}
+		// 课程平均得分率
+		// 课程总分
+		mv.addObject("studentList", studentList);
+		info.put("STUDENT_NUM", studentList != null ? studentList.size() : 0);
+		mv.addObject("info", info);
+		mv.setViewName("sunvote/teacher/teacher_report_1");
+		return mv;
+	}
+	
+	@RequestMapping(value="/teacher_report")
+	public ModelAndView teacher_report() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"教师报表");
+		ModelAndView mv = this.getModelAndView();
+		return mv;
+	}
+	
+	@RequestMapping(value="/student_report")
+	public ModelAndView student_report() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"学生成绩报表");
+		ModelAndView mv = this.getModelAndView();
+		
+		PageData pd = getPageData();
+		pd.put("CLASS_ID", pd.get("CLASSID"));
+		List<PageData> studentList = studentService.listAllClass(pd);
+		
+		mv.addObject("studentList", studentList);
+		mv.setViewName("");
+		return mv;
+	}
+	
+	@RequestMapping(value = "/student_report_data", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public Object student_report_data() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"学生报表数据");
+		PageData pd = getPageData();
+		ResponseGson<List<PageData>> ret = new ResponseGson();
+		pd.put("CLASS_ID", pd.get("CLASSID"));
+		List<PageData> studentList = studentService.listAllClass(pd);
+		List<PageData> testpaperList = testpaperService.listAll(pd);
+		
+		int totalScore = 0 ;
+		for(PageData testPaperPageData:testpaperList){
+			String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
+			if(totalScoreStr != null){
+				try{
+					totalScore += Integer.parseInt(totalScoreStr);
+				}catch(Exception ex){
+					logger.info(ex);
+				}
+			}
+			
+		}
+		int allGetScore = 0;
+		// 查询学生名单及人数
+		if(studentList != null && studentList.size() > 0){
+			for(PageData studentPageData : studentList){
+				PageData search = new PageData();
+				search.put("STUDENT_ID", studentPageData.getString("ID"));
+				if(pd.containsKey("START_DATE")){
+					search.put("START_DATE", pd.getString("START_DATE"));
+				}
+				if(pd.containsKey("END_DATE")){
+					search.put("END_DATE", pd.getString("END_DATE"));
+				}
+				List<PageData> studentTestList = studenttestService.reportListData(search);
+				studentPageData.put("testList", studentTestList);
+				
+				int getScore = 0 ;
+				for(PageData studentTestPageData:studentTestList){
+					String getScoreStr = studentTestPageData.getString("SCORE");
+					if(getScoreStr != null){
+						try{
+							getScore += Integer.parseInt(getScoreStr);
+						}catch(Exception ex){
+							logger.info(ex);
+						}
+					}
+				}
+				studentPageData.put("TOTALSCORE", totalScore);
+				studentPageData.put("GETSCORE", getScore);
+				studentPageData.remove("GROUPID");
+				studentPageData.remove("REMARK");
+				studentPageData.remove("PARENT_PHONE");
+				studentPageData.remove("PARENT_NAME");
+				studentPageData.remove("NUMBER");
+				studentPageData.remove("SIGN_NO");
+				studentPageData.remove("KEYPAD_ID");
+				studentPageData.remove("SNO");
+				
+				allGetScore += getScore;
+				
+			}
+		}
+		ret.setData(studentList);
+		
+		return ret.toJson();
+	}
+	
+	@RequestMapping(value="/test_report")
+	public ModelAndView paper_report() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"测试试卷报表");
+		ModelAndView mv = this.getModelAndView();
+		return mv;
+	}
+	
+}
diff --git a/src/com/fh/service/sunvote/networkstatistics/NetworkStatisticsManager.java b/src/com/fh/service/sunvote/networkstatistics/NetworkStatisticsManager.java
new file mode 100644
index 0000000..b184a87
--- /dev/null
+++ b/src/com/fh/service/sunvote/networkstatistics/NetworkStatisticsManager.java
@@ -0,0 +1,63 @@
+package com.fh.service.sunvote.networkstatistics;
+
+import java.util.List;
+import com.fh.entity.Page;
+import com.fh.util.PageData;
+
+/** 
+ * 说明： 网络统计接口
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-26
+ * @version
+ */
+public interface NetworkStatisticsManager{
+
+	/**新增
+	 * @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;
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByClientID(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/networkstatistics/impl/NetworkStatisticsService.java b/src/com/fh/service/sunvote/networkstatistics/impl/NetworkStatisticsService.java
new file mode 100644
index 0000000..0820cca
--- /dev/null
+++ b/src/com/fh/service/sunvote/networkstatistics/impl/NetworkStatisticsService.java
@@ -0,0 +1,90 @@
+package com.fh.service.sunvote.networkstatistics.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.networkstatistics.NetworkStatisticsManager;
+
+/** 
+ * 说明： 网络统计
+ * 创建人：FH Q313596790
+ * 创建时间：2018-06-26
+ * @version
+ */
+@Service("networkstatisticsService")
+public class NetworkStatisticsService implements NetworkStatisticsManager{
+
+	@Resource(name = "daoSupport")
+	private DaoSupport dao;
+	
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		dao.save("NetworkStatisticsMapper.save", pd);
+	}
+	
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		dao.delete("NetworkStatisticsMapper.delete", pd);
+	}
+	
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		dao.update("NetworkStatisticsMapper.edit", pd);
+	}
+	
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> list(Page page)throws Exception{
+		return (List<PageData>)dao.findForList("NetworkStatisticsMapper.datalistPage", page);
+	}
+	
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("NetworkStatisticsMapper.listAll", pd);
+	}
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("NetworkStatisticsMapper.findById", pd);
+	}
+	
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByClientID(PageData pd)throws Exception{
+		return (PageData)dao.findForObject("NetworkStatisticsMapper.findByClientID", pd);
+	}
+	
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		dao.delete("NetworkStatisticsMapper.deleteAll", ArrayDATA_IDS);
+	}
+	
+}
+
diff --git a/src/com/fh/service/sunvote/student/StudentManager.java b/src/com/fh/service/sunvote/student/StudentManager.java
index fd75f2d..6192cfb 100644
--- a/src/com/fh/service/sunvote/student/StudentManager.java
+++ b/src/com/fh/service/sunvote/student/StudentManager.java
@@ -61,5 +61,21 @@ public interface StudentManager{
 	 */
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
 	
+	/**
+	 * 列出当前班级学生名单
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> listAllClass(PageData pd)throws Exception;
+	
+	/**
+	 * 查询班级学期的学生名单
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> listAllClassByTerm(PageData pd)throws Exception;
+	
 }
 
diff --git a/src/com/fh/service/sunvote/student/impl/StudentService.java b/src/com/fh/service/sunvote/student/impl/StudentService.java
index 5020598..b96974a 100644
--- a/src/com/fh/service/sunvote/student/impl/StudentService.java
+++ b/src/com/fh/service/sunvote/student/impl/StudentService.java
@@ -71,6 +71,17 @@ public class StudentService implements StudentManager{
 		return (List<PageData>)dao.findForList("StudentMapper.listAll", pd);
 	}
 	
+	
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAllClass(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("StudentMapper.listAllClass", pd);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public List<PageData> listAllClassByTerm(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("StudentMapper.listAllClassByTerm", pd);
+	}
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/service/sunvote/studenttest/StudentTestManager.java b/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
index de112bb..384a3c0 100644
--- a/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
+++ b/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
@@ -41,6 +41,11 @@ public interface StudentTestManager{
 	 * @throws Exception
 	 */
 	public List<PageData> listAll(PageData pd)throws Exception;
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> reportListData(PageData pd)throws Exception;
 	
 	/**通过id获取数据
 	 * @param pd
diff --git a/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java b/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
index bcc5ee2..70de7ad 100644
--- a/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
+++ b/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
@@ -1,8 +1,11 @@
 package com.fh.service.sunvote.studenttest.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;
@@ -77,6 +80,11 @@ public class StudentTestService implements StudentTestManager{
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
 		dao.delete("StudentTestMapper.deleteAll", ArrayDATA_IDS);
 	}
+
+	@Override
+	public List<PageData> reportListData(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("StudentTestMapper.reportListData", pd);
+	}
 	
 }
 
--
libgit2 0.21.4