From 6ec88f667a0d3b24cdde3965d395c95ad86bd64c Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Fri, 22 Jun 2018 14:39:22 +0800
Subject: [PATCH] 获取班级学生的bug 修复

---
 WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp                                               | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebRoot/afterService/document/基站-EA1000-常见问题解答V1.0-20170825.pdf                   | Bin 0 -> 220753 bytes
 WebRoot/afterService/document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf | Bin 0 -> 226318 bytes
 resources/mybatis1/api/V1Mapper.xml                                                               |   4 ++--
 src/com/fh/interceptor/UrlFilter.java                                                             |  33 +++++++++++++++++++++++++++++++++
 5 files changed, 155 insertions(+), 2 deletions(-)
 create mode 100644 WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
 create mode 100644 WebRoot/afterService/document/基站-EA1000-常见问题解答V1.0-20170825.pdf
 create mode 100644 WebRoot/afterService/document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf
 create mode 100644 src/com/fh/interceptor/UrlFilter.java
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
new file mode 100644
index 0000000..011d527
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/uploadexcel.jsp
@@ -0,0 +1,120 @@
+<%@ 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%>">
+
+<!-- jsp文件头和头部 -->
+<%@ include file="../../system/index/top.jsp"%>
+
+</head>
+<body class="no-skin">
+
+	<!-- /section:basics/navbar.layout -->
+	<div class="main-container" id="main-container">
+		<!-- /section:basics/sidebar -->
+		<div class="main-content">
+			<div class="main-content-inner">
+				<div class="page-content">
+					<div class="row">
+						<div class="col-xs-12">
+							<form action="student/readExcel.do?CLASS_ID=${pd.CLASS_ID}&TERM_ID=${pd.TERM_ID}" name="Form" id="Form" method="post" enctype="multipart/form-data">
+								<div id="zhongxin">
+									<input type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}"/>
+									<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}"/>
+								<table style="width:95%;" >
+									<tr>
+										<td style="padding-top: 20px;"><input type="file" id="excel" name="excel" style="width:50px;" onchange="fileType(this)" /></td>
+									</tr>
+									<tr>
+										<td style="text-align: center;padding-top: 10px;">
+											<a class="btn btn-mini btn-primary" onclick="save();">导入</a>
+											<a class="btn btn-mini btn-danger" onclick="top.Dialog.close();">取消</a>
+											<a style="display:none" class="btn btn-mini btn-success" onclick="window.location.href='<%=basePath%>/user/downExcel.do'">下载模版</a>
+										</td>
+									</tr>
+								</table>
+								</div>
+								<div id="zhongxin2" class="center" style="display:none"><br/><img src="static/images/jzx.gif" /><br/><h4 class="lighter block green"></h4></div>
+							</form>
+						</div>
+						<!-- /.col -->
+					</div>
+					<!-- /.row -->
+				</div>
+				<!-- /.page-content -->
+			</div>
+		</div>
+		<!-- /.main-content -->
+	</div>
+	<!-- /.main-container -->
+
+	<!-- basic scripts -->
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot.jsp"%>
+	<!-- ace scripts -->
+	<script src="static/ace/js/ace/ace.js"></script>
+	<!-- 上传控件 -->
+	<script src="static/ace/js/ace/elements.fileinput.js"></script>
+	<!--提示框-->
+	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+	<script type="text/javascript">
+		$(top.hangge());
+		$(function() {
+			//上传
+			$('#excel').ace_file_input({
+				no_file:'请选择EXCEL ...',
+				btn_choose:'选择',
+				btn_change:'更改',
+				droppable:false,
+				onchange:null,
+				thumbnail:false, //| true | large
+				whitelist:'xls|xls',
+				blacklist:'gif|png|jpg|jpeg'
+				//onchange:''
+			});
+		});
+		
+		//保存
+		function save(){
+			if($("#excel").val()=="" || document.getElementById("excel").files[0] =='请选择xls格式的文件'){
+				
+				$("#excel").tips({
+					side:3,
+		            msg:'请选择文件',
+		            bg:'#AE81FF',
+		            time:3
+		        });
+				return false;
+			}
+			$("#Form").submit();
+			$("#zhongxin").hide();
+			$("#zhongxin2").show();
+		}
+		function fileType(obj){
+			var fileType=obj.value.substr(obj.value.lastIndexOf(".")).toLowerCase();//获得文件后缀名
+		    if(fileType != '.xls'){
+		    	$("#excel").tips({
+					side:3,
+		            msg:'请上传xls格式的文件',
+		            bg:'#AE81FF',
+		            time:3
+		        });
+		    	$("#excel").val('');
+		    	document.getElementById("excel").files[0] = '请选择xls格式的文件';
+		    }
+		}
+	</script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/WebRoot/afterService/document/基站-EA1000-常见问题解答V1.0-20170825.pdf b/WebRoot/afterService/document/基站-EA1000-常见问题解答V1.0-20170825.pdf
new file mode 100644
index 0000000..3989d07
Binary files /dev/null and b/WebRoot/afterService/document/基站-EA1000-常见问题解答V1.0-20170825.pdf differ
diff --git a/WebRoot/afterService/document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf b/WebRoot/afterService/document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf
new file mode 100644
index 0000000..dbdb8bd
Binary files /dev/null and b/WebRoot/afterService/document/答题器-S56-常见问题解答V1.0-20180227（高思定制）.pdf differ
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index b6c8968..6dd64b9 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -44,8 +44,8 @@
 			sv_student.`KEYPAD_ID`
 			FROM
 				sv_classroster
-			LEFT JOIN sv_term ON sv_classroster.TEAMID = sv_term.TERM_ID
-			LEFT JOIN sv_student ON sv_classroster.STUDENT_ID = sv_student.ID
+			inner JOIN sv_term ON sv_classroster.TEAMID = sv_term.TERM_ID
+			inner JOIN sv_student ON sv_classroster.STUDENT_ID = sv_student.ID
 			WHERE
 				sv_term.START_DATE &lt; NOW()
 			AND sv_term.END_DATE &gt; NOW()
diff --git a/src/com/fh/interceptor/UrlFilter.java b/src/com/fh/interceptor/UrlFilter.java
new file mode 100644
index 0000000..f5e1698
--- /dev/null
+++ b/src/com/fh/interceptor/UrlFilter.java
@@ -0,0 +1,33 @@
+package com.fh.interceptor;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+public class UrlFilter implements Filter  {
+
+	@Override
+	public void destroy() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void doFilter(ServletRequest arg0, ServletResponse arg1,
+			FilterChain arg2) throws IOException, ServletException {
+		
+		
+	}
+
+	@Override
+	public void init(FilterConfig arg0) throws ServletException {
+		
+	}
+
+	
+}
--
libgit2 0.21.4

