From d7525cae337f717e8094d6a9fa9d4bbfbf19924d Mon Sep 17 00:00:00 2001 From: jack-rabbit <376168706@qq.com> Date: Mon, 2 Dec 2019 17:39:13 +0800 Subject: [PATCH] 1.学生老师导入导出 2.客户端登录接口添加年级id 3.客户端试卷接口增加试卷类型筛选（年级卷，个人卷） --- WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp | 6 ++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/en_uploadexcel.jsp | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp | 19 +++++++++++++++++++ WebRoot/WEB-INF/jsp/sunvote/teacher/uploadexcel.jsp | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ WebRoot/WEB-INF/jsp/system/index/login.jsp | 2 +- WebRoot/static/files/Template1.xls | Bin 0 -> 18944 bytes resources/mybatis1/api/V1Mapper.xml | 2 +- resources/mybatis1/sunvote/PaperMapper.xml | 6 ++++++ resources/mybatis1/sunvote/StudentMapper.xml | 4 +++- resources/mybatis1/sunvote/SubjectMapper.xml | 10 ++++++++++ resources/mybatis1/sunvote/TeacherMapper.xml | 31 ++++++++++++++++++++++++++++++- src/com/fh/controller/api/V1.java | 7 +++++++ src/com/fh/controller/sunvote/student/StudentController.java | 47 ++++++++++++++++++++++++++--------------------- src/com/fh/controller/sunvote/teacher/TeacherController.java | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/com/fh/service/sunvote/subject/SubjectManager.java | 6 ++++++ src/com/fh/service/sunvote/subject/impl/SubjectService.java | 8 ++++++++ src/com/fh/service/sunvote/teacher/TeacherManager.java | 6 ++++++ src/com/fh/service/sunvote/teacher/impl/TeacherService.java | 8 ++++++++ 18 files changed, 620 insertions(+), 28 deletions(-) create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/en_uploadexcel.jsp create mode 100644 WebRoot/WEB-INF/jsp/sunvote/teacher/uploadexcel.jsp create mode 100644 WebRoot/static/files/Template1.xls diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp index daacd30..0911558 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp @@ -102,6 +102,9 @@
+
+ +
@@ -214,6 +217,9 @@ }); window.top.modal.show(); } + function export2(){ + window.open('<%=basePath%>student/excel?class_id=${pd.CLASS_ID}','_blank'); + } \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_uploadexcel.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_uploadexcel.jsp new file mode 100644 index 0000000..f22ac19 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_uploadexcel.jsp @@ -0,0 +1,198 @@ +<%@ 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 + "/"; +%> + + + + + + +<%@ include file="../../system/index/top.jsp"%> + + + + + + + + +
+ +
+
+
+
+
+
+
+ + + + + + + + + +
+ Import + Download template +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp index 0ffe6e8..a756d59 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp @@ -113,6 +113,12 @@
+
+ +
+
+ +
@@ -278,6 +284,19 @@ }}); window.top.remove.show(); } + function upload(){ + window.top.modal.init({ + 'title':'EXCEL导入教师名单', + 'url':'<%=basePath%>teacher/goUploadExcel.do?school_id=${pd.SCHOOL_ID}', + func:function() { + tosearch(); + } + }); + window.top.modal.show(); + } + function export2(){ + window.open('<%=basePath%>teacher/excel?school_id=${pd.SCHOOL_ID}','_blank'); + } diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/uploadexcel.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/uploadexcel.jsp new file mode 100644 index 0000000..d2de703 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/uploadexcel.jsp @@ -0,0 +1,198 @@ +<%@ 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 + "/"; +%> + + + + + + +<%@ include file="../../system/index/top.jsp"%> + + + + + + + + +
+ +
+
+
+
+
+
+
+ + + + + + + + + +
+ 导入 + 下载模板 +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp index 95488a4..fddbacb 100644 --- a/WebRoot/WEB-INF/jsp/system/index/login.jsp +++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp @@ -105,7 +105,7 @@ body{
- 备案许可证号： 湘ICP备09025927号-10 +