更新链接

孙向锦
1 parent 75c39cc6
Showing 20 changed files with 241 additions and 45 deletions
WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_edit.jsp
WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_list.jsp
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp
WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp
WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit.jsp
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp
WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_edit.jsp
WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp
resources/mybatis1/sunvote/TeachingMaterialMapper.xml
resources/spring/ApplicationContext-main.xml
src/com/fh/controller/api/ApiServer.java
src/com/fh/controller/sunvote/chapter/ChapterController.java
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
src/com/fh/controller/sunvote/sclass/SClassController.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java
@@ -45,7 +45,13 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">所属教材:</td>
-								<td><input type="number" name="TEACHINGMATERIAL_ID" id="TEACHINGMATERIAL_ID" value="${pd.TEACHINGMATERIAL_ID}" maxlength="32" placeholder="这里输入所属教材" title="所属教材" style="width:98%;"/></td>
+								<td>
+								<%-- <input type="number" name="TEACHINGMATERIAL_ID" id="TEACHINGMATERIAL_ID" value="${pd.TEACHINGMATERIAL_ID}" maxlength="32" placeholder="这里输入所属教材" title="所属教材" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="TEACHINGMATERIAL_ID" id="TEACHINGMATERIAL_ID" data-placeholder="这里输入所属年级">
+									<c:forEach var="item" items="${teachings}">
+										<option value="${item.ID}"  <c:if test="${pd.TEACHINGMATERIAL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
 							</tr>
 							<tr>
 								<td style="text-align: center;" colspan="10">
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
 <%
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://"
@@ -88,7 +89,7 @@
 											<td class='center'>${var.NAME}</td>
 											<td class='center'>${var.CDESCRIPTION}</td>
 											<td class='center'>${var.REMARK}</td>
-											<td class='center'>${var.TEACHINGMATERIAL_ID}</td>
+											<td class='center'>${myelfun:findTeachingmaterialName(var.TEACHINGMATERIAL_ID)}</td>
 											<td class="center">
 												<c:if test="${QX.edit != 1 && QX.del != 1 }">
 												<span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
@@ -33,15 +33,36 @@
 						<table id="table_report" class="table table-striped table-bordered table-hover">
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">老师:</td>
-								<td><input type="number" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}" maxlength="32" placeholder="这里输入老师" title="老师" style="width:98%;"/></td>
+								<td>
+								<%-- <input type="number" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}" maxlength="32" placeholder="这里输入老师" title="老师" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="TEACHER_ID" id="TEACHER_ID" data-placeholder="这里输入班级类型">
+									<c:forEach var="item" items="${teachers}">
+										<option value="${item.ID}"  <c:if test="${pd.TEACHER_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
-								<td style="width:75px;text-align: right;padding-top: 13px;">班级ID:</td>
-								<td><input type="number" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}" maxlength="32" placeholder="这里输入班级ID" title="班级ID" style="width:98%;"/></td>
+								<td style="width:75px;text-align: right;padding-top: 13px;">班级:</td>
+								<td>
+								<%-- <input type="number" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}" maxlength="32" placeholder="这里输入班级ID" title="班级ID" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="CLASS_ID" id="CLASS_ID" data-placeholder="这里输入班级类型">
+									<c:forEach var="item" items="${classs}">
+										<option value="${item.ID}"  <c:if test="${pd.CLASS_ID==item.ID}">selected="true"</c:if>>${item.CLASS_NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">科目:</td>
-								<td><input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td>
+								<td>
+								<%-- <input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入班级类型">
+									<c:forEach var="item" items="${subjects}">
+										<option value="${item.ID}"  <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">开始时间:</td>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
 <%
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://"
@@ -67,7 +68,7 @@
 									</th>
 									<th class="center" style="width:50px;">序号</th>
 									<th class="center">老师</th>
-									<th class="center">班级ID</th>
+									<th class="center">班级</th>
 									<th class="center">科目</th>
 									<th class="center">开始时间</th>
 									<th class="center">结束时间</th>
@@ -87,9 +88,9 @@
 												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.ID}" class="ace" /><span class="lbl"></span></label>
 											</td>
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
-											<td class='center'>${var.TEACHER_ID}</td>
-											<td class='center'>${var.CLASS_ID}</td>
-											<td class='center'>${var.SUBJECT_ID}</td>
+											<td class='center'>${myelfun:findTeacherName(var.TEACHER_ID)}</td>
+											<td class='center'>${myelfun:findClassName(var.CLASS_ID)}</td>
+											<td class='center'>${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
 											<td class='center'>${var.START_DATE}</td>
 											<td class='center'>${var.END_DATE}</td>
 											<td class='center'>${var.REMARK}</td>
@@ -41,11 +41,22 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">是否正常:</td>
-								<td><input type="number" name="IS_OK" id="IS_OK" value="${pd.IS_OK}" maxlength="32" placeholder="这里输入是否正常" title="是否正常" style="width:98%;"/></td>
+								<td>
+								<select class="chosen-select form-control" name="IS_OK" id="IS_OK" data-placeholder="这里输入所属年级">
+									<option value="1"  <c:if test="${pd.IS_OK== 1}">selected="true"</c:if>>正常</option>
+									<option value="0"  <c:if test="${pd.IS_OK== 0}">selected="true"</c:if>>损坏</option>
+								</select>
+								</td>
+								<%-- <input type="number" name="IS_OK" id="IS_OK" value="${pd.IS_OK}" maxlength="32" placeholder="这里输入是否正常" title="是否正常" style="width:98%;"/></td> --%>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">工作模式:</td>
-								<td><input type="number" name="WORK_MODE" id="WORK_MODE" value="${pd.WORK_MODE}" maxlength="32" placeholder="这里输入工作模式" title="工作模式" style="width:98%;"/></td>
+								<td>
+								<%-- <input type="number" name="WORK_MODE" id="WORK_MODE" value="${pd.WORK_MODE}" maxlength="32" placeholder="这里输入工作模式" title="工作模式" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="WORK_MODE" id="WORK_MODE" data-placeholder="这里输入所属年级">
+									<option value="1"  <c:if test="${pd.WORK_MODE== 1}">selected="true"</c:if>>RF模式</option>
+									<option value="2"  <c:if test="${pd.WORK_MODE== 2}">selected="true"</c:if>>433模式</option>
+								</select>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">生产时间:</td>
@@ -88,8 +88,8 @@
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
 											<td class='center'>${var.NO}</td>
 											<td class='center'>${var.SN}</td>
-											<td class='center'>${var.IS_OK}</td>
-											<td class='center'>${var.WORK_MODE}</td>
+											<td class='center'>${var.IS_OK == 1 ? "正常":"损坏"}</td>
+											<td class='center'>${var.WORK_MODE == 1 ? "RF模式" : "433模式"}</td>
 											<td class='center'>${var.PRODUCT_DATE}</td>
 											<td class="center">
 												<c:if test="${QX.edit != 1 && QX.del != 1 }">
@@ -33,15 +33,37 @@
 						<table id="table_report" class="table table-striped table-bordered table-hover">
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">所属学校:</td>
-								<td><input type="text" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="255" placeholder="这里输入所属学校" title="所属学校" style="width:98%;"/></td>
+								<td>
+								<%-- <input type="text" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="255" placeholder="这里输入所属学校" title="所属学校" style="width:98%;"/> --%>
+								
+								<select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" data-placeholder="这里输入所属学校">
+									<c:forEach var="item" items="${schools}">
+										<option value="${item.ID}"  <c:if test="${pd.SCHOOL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">所属年级:</td>
-								<td><input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td>
+								<td>
+								<%-- <input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入所属年级">
+									<c:forEach var="item" items="${grades}">
+										<option value="${item.ID}"  <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级类型:</td>
-								<td><input type="text" name="CLASS_TYPE" id="CLASS_TYPE" value="${pd.CLASS_TYPE}" maxlength="255" placeholder="这里输入班级类型" title="班级类型" style="width:98%;"/></td>
+								<td>
+								<%-- <input type="text" name="CLASS_TYPE" id="CLASS_TYPE" value="${pd.CLASS_TYPE}" maxlength="255" placeholder="这里输入班级类型" title="班级类型" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="CLASS_TYPE" id="CLASS_TYPE" data-placeholder="这里输入班级类型">
+									<c:forEach var="item" items="${classTypes}">
+										<option value="${item.ID}"  <c:if test="${pd.CLASS_TYPE==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td>
@@ -53,7 +75,14 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级基站:</td>
-								<td><input type="text" name="BASESTATION_ID" id="BASESTATION_ID" value="${pd.BASESTATION_ID}" maxlength="255" placeholder="这里输入班级基站" title="班级基站" style="width:98%;"/></td>
+								<td>
+								<%-- <input type="text" name="BASESTATION_ID" id="BASESTATION_ID" value="${pd.BASESTATION_ID}" maxlength="255" placeholder="这里输入班级基站" title="班级基站" style="width:98%;"/></td> --%>
+								<select class="chosen-select form-control" name="BASESTATION_ID" id="BASESTATION_ID" data-placeholder="这里输入班级基站">
+									<c:forEach var="item" items="${basestations}">
+										<option value="${item.ID}"  <c:if test="${pd.BASESTATION_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
 							</tr>
 							<tr>
 								<td style="text-align: center;" colspan="10">
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
+
 <%
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://"
@@ -87,12 +89,12 @@
 												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.ID}" class="ace" /><span class="lbl"></span></label>
 											</td>
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
-											<td class='center'>${var.SCHOOL_ID}</td>
-											<td class='center'>${var.GRADE_ID}</td>
-											<td class='center'>${var.CLASS_TYPE}</td>
+											<td class='center'>${myelfun:findSchoolName(var.SCHOOL_ID)}</td>
+											<td class='center'>${myelfun:findGradeName(var.GRADE_ID)}</td>
+											<td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td>
 											<td class='center'>${var.CLASS_NAME}</td>
 											<td class='center'>${var.CLASS_CODE}</td>
-											<td class='center'>${var.BASESTATION_ID}</td>
+											<td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td>
 											<td class="center">
 												<c:if test="${QX.edit != 1 && QX.del != 1 }">
 												<span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
@@ -33,7 +33,14 @@
 						<table id="table_report" class="table table-striped table-bordered table-hover">
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">所在学校:</td>
-								<td><input type="number" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="32" placeholder="这里输入所在学校" title="所在学校" style="width:98%;"/></td>
+								<td>
+								<select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" data-placeholder="这里输入所属学校">
+									<c:forEach var="item" items="${schools}">
+										<option value="${item.ID}"  <c:if test="${pd.SCHOOL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
+								<%-- <input type="number" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="32" placeholder="这里输入所在学校" title="所在学校" style="width:98%;"/></td> --%>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
@@ -57,11 +64,17 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
-								<td><input type="text" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
+								<td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
-								<td><input type="number" name="SEX" id="SEX" value="${pd.SEX}" maxlength="32" placeholder="这里输入性别" title="性别" style="width:98%;"/></td>
+								<td>
+								<select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="选择性别">
+										<option value="1"  <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>
+										<option value="2"  <c:if test="${pd.SEX==2}">selected="true"</c:if>>女</option>
+								</select>
+								</td>
+								<%-- <input type="number" name="SEX" id="SEX" value="${pd.SEX}" maxlength="32" placeholder="这里输入性别" title="性别" style="width:98%;"/></td> --%>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">科目列表:</td>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
 <%
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://"
@@ -72,7 +73,6 @@
 									<th class="center">座机电话</th>
 									<th class="center">证件号</th>
 									<th class="center">账号</th>
-									<th class="center">密码</th>
 									<th class="center">性别</th>
 									<th class="center">科目列表</th>
 									<th class="center">教师卡编号</th>
@@ -91,14 +91,13 @@
 												<label class="pos-rel"><input type='checkbox' name='ids' value="${var.ID}" class="ace" /><span class="lbl"></span></label>
 											</td>
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
-											<td class='center'>${var.SCHOOL_ID}</td>
+											<td class='center'>${myelfun:findSchoolName(var.SCHOOL_ID)}</td>
 											<td class='center'>${var.NAME}</td>
 											<td class='center'>${var.PHONE}</td>
 											<td class='center'>${var.SEAT_PHONE}</td>
 											<td class='center'>${var.CARD_NO}</td>
 											<td class='center'>${var.ACCOUT}</td>
-											<td class='center'>${var.PASSWORD}</td>
-											<td class='center'>${var.SEX}</td>
+											<td class='center'>${var.SEX == 1? "男":"女"}</td>
 											<td class='center'>${var.SUBJECT_IDS}</td>
 											<td class='center'>${var.KEYPAD_ID}</td>
 											<td class="center">
@@ -2,6 +2,7 @@
 <%@ 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+"/";
@@ -37,11 +38,25 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">所属科目:</td>
-								<td><input type="text" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="255" placeholder="这里输入所属科目" title="所属科目" style="width:98%;"/></td>
+								<td>
+								<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属科目">
+									<c:forEach var="item" items="${subjects}">
+										<option value="${item.ID}"  <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
+									</c:forEach>
+								</select>
+								</td>
+								<%-- <input type="text" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_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="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td>
+								<td>
+								<select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入所属科目">
+									<c:forEach var="item" items="${grades}">
+										<option value="${item.ID}"  <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
+								<%-- <input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td> --%>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">教材版本号:</td>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
 <%
 	String path = request.getContextPath();
 	String basePath = request.getScheme() + "://"
@@ -87,8 +88,8 @@
 											</td>
 											<td class='center' style="width: 30px;">${vs.index+1}</td>
 											<td class='center'>${var.NAME}</td>
-											<td class='center'>${var.SUBJECT_ID}</td>
-											<td class='center'>${var.GRADE_ID}</td>
+											<td class='center'>${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
+											<td class='center'>${myelfun:findGradeName(var.GRADE_ID)}</td>
 											<td class='center'>${var.VERSION_CODE}</td>
 											<td class='center'>${var.VERSION_NAME}</td>
 											<td class="center">
@@ -32,9 +32,17 @@
 		insert into 
 	<include refid="tableName"></include>
 		(
-	<include refid="Field"></include>
+	NAME,	
+		SUBJECT_ID,	
+		GRADE_ID,	
+		VERSION_CODE,	
+		VERSION_NAME
 		) values (
-	<include refid="FieldValue"></include>
+	#{NAME},	
+		#{SUBJECT_ID},	
+		#{GRADE_ID},	
+		#{VERSION_CODE},	
+		#{VERSION_NAME}
 		)
 	</insert>
@@ -56,7 +64,7 @@
 			GRADE_ID = #{GRADE_ID},
 			VERSION_CODE = #{VERSION_CODE},
 			VERSION_NAME = #{VERSION_NAME},
-		ID = ID
+		ID = #{ID}
 		where 
 		ID = #{ID}
 	</update>
@@ -34,4 +34,6 @@
         </property>  
 	</bean> 
+   <bean id="springBeanFactoryUtils" class="com.fh.util.SpringBeanFactoryUtils"/>
+   
 </beans>
@@ -28,14 +28,6 @@ public class ApiServer extends BaseController {
 	private KeypadManager keypadService;
-	@RequestMapping(value="/*" ,produces="application/json;charset=UTF-8")
-	@ResponseBody
-	public Object Default() throws Exception{
-		ResponseGson<Void> respone = new ResponseGson();
-		respone.setPathError();
-		return respone.toJson();
-	}
-	
 	@RequestMapping(value="/school" ,produces="application/json;charset=UTF-8")
 	@ResponseBody
 	public Object schoolDefault() throws Exception{
@@ -8,7 +8,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Resource;
+
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.util.AppUtil;
@@ -24,6 +27,7 @@ import com.fh.util.PageData;
 import com.fh.util.Jurisdiction;
 import com.fh.util.Tools;
 import com.fh.service.sunvote.chapter.ChapterManager;
+import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager;
 /** 
  * 说明：章节管理
@@ -38,6 +42,9 @@ public class ChapterController extends BaseController {
 	@Resource(name="chapterService")
 	private ChapterManager chapterService;
+	@Resource(name="teachingmaterialService")
+	private TeachingMaterialManager teachingmaterialService;
+	
 	/**保存
 	 * @param
 	 * @throws Exception
@@ -121,6 +128,10 @@ public class ChapterController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		mv.setViewName("sunvote/chapter/chapter_edit");
+		
+		List<PageData>	teachings = teachingmaterialService.listAll(pd);	
+		mv.addObject("teachings", teachings);
+		
 		mv.addObject("msg", "save");
 		mv.addObject("pd", pd);
 		return mv;
@@ -137,6 +148,10 @@ public class ChapterController extends BaseController {
 		pd = this.getPageData();
 		pd = chapterService.findById(pd);	//根据ID读取
 		mv.setViewName("sunvote/chapter/chapter_edit");
+		
+		List<PageData>	teachings = teachingmaterialService.listAll(pd);	
+		mv.addObject("teachings", teachings);
+		
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);
 		return mv;
@@ -8,7 +8,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Resource;
+
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.util.AppUtil;
@@ -24,6 +27,9 @@ import com.fh.util.PageData;
 import com.fh.util.Jurisdiction;
 import com.fh.util.Tools;
 import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
+import com.fh.service.sunvote.sclass.SClassManager;
+import com.fh.service.sunvote.subject.SubjectManager;
+import com.fh.service.sunvote.teacher.TeacherManager;
 /** 
  * 说明：任课管理
@@ -38,6 +44,15 @@ public class CourseManagementController extends BaseController {
 	@Resource(name="coursemanagementService")
 	private CourseManagementManager coursemanagementService;
+	@Resource(name="teacherService")
+	private TeacherManager teacherService;
+	
+	@Resource(name="sclassService")
+	private SClassManager sclassService;
+	
+	@Resource(name="subjectService")
+	private SubjectManager subjectService;
+	
 	/**保存
 	 * @param
 	 * @throws Exception
@@ -121,6 +136,14 @@ public class CourseManagementController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		mv.setViewName("sunvote/coursemanagement/coursemanagement_edit");
+		
+		List<PageData> teachers = teacherService.listAll(pd);
+		mv.addObject("teachers",teachers);
+		List<PageData> classs = sclassService.listAll(pd);
+		mv.addObject("classs",classs);
+		List<PageData> subjects = subjectService.listAll(pd);
+		mv.addObject("subjects", subjects);
+		
 		mv.addObject("msg", "save");
 		mv.addObject("pd", pd);
 		return mv;
@@ -137,6 +160,13 @@ public class CourseManagementController extends BaseController {
 		pd = this.getPageData();
 		pd = coursemanagementService.findById(pd);	//根据ID读取
 		mv.setViewName("sunvote/coursemanagement/coursemanagement_edit");
+		List<PageData> teachers = teacherService.listAll(pd);
+		mv.addObject("teachers",teachers);
+		List<PageData> classs = sclassService.listAll(pd);
+		mv.addObject("classs",classs);
+		List<PageData> subjects = subjectService.listAll(pd);
+		mv.addObject("subjects", subjects);
+		
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);
 		return mv;
@@ -125,8 +125,8 @@ public class SClassController extends BaseController {
 			pd.put("keywords", keywords.trim());
 		}
 		page.setPd(pd);
-		List<PageData>	varList = sclassService.list(page);	//列出SClass列表
 		mv.setViewName("sunvote/sclass/sclass_list");
+		List<PageData>	varList = sclassService.list(page);	//列出SClass列表
 		mv.addObject("varList", varList);
 		mv.addObject("pd", pd);
 		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限
@@ -143,6 +143,14 @@ public class SClassController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		mv.setViewName("sunvote/sclass/sclass_edit");
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools",schools);
+		List<PageData> basestations = basestationService.listAll(pd);
+		mv.addObject("basestations",basestations);
+		List<PageData> grades = gradeService.listAll(pd);
+		mv.addObject("grades", grades);
+		List<PageData> classTypes = classtypeService.listAll(pd);
+		mv.addObject("classTypes", classTypes);
 		mv.addObject("msg", "save");
 		mv.addObject("pd", pd);
 		return mv;
@@ -159,6 +167,14 @@ public class SClassController extends BaseController {
 		pd = this.getPageData();
 		pd = sclassService.findById(pd);	//根据ID读取
 		mv.setViewName("sunvote/sclass/sclass_edit");
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools",schools);
+		List<PageData> basestations = basestationService.listAll(pd);
+		mv.addObject("basestations",basestations);
+		List<PageData> grades = gradeService.listAll(pd);
+		mv.addObject("grades", grades);
+		List<PageData> classTypes = classtypeService.listAll(pd);
+		mv.addObject("classTypes", classTypes);
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);
 		return mv;
@@ -8,7 +8,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Resource;
+
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.util.AppUtil;
@@ -23,6 +26,7 @@ import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
 import com.fh.util.Jurisdiction;
 import com.fh.util.Tools;
+import com.fh.service.sunvote.school.SchoolManager;
 import com.fh.service.sunvote.teacher.TeacherManager;
 /** 
@@ -38,6 +42,9 @@ public class TeacherController extends BaseController {
 	@Resource(name="teacherService")
 	private TeacherManager teacherService;
+	@Resource(name="schoolService")
+	private SchoolManager schoolService;
+	
 	/**保存
 	 * @param
 	 * @throws Exception
@@ -121,6 +128,10 @@ public class TeacherController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		mv.setViewName("sunvote/teacher/teacher_edit");
+		
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools",schools);
+		
 		mv.addObject("msg", "save");
 		mv.addObject("pd", pd);
 		return mv;
@@ -137,6 +148,8 @@ public class TeacherController extends BaseController {
 		pd = this.getPageData();
 		pd = teacherService.findById(pd);	//根据ID读取
 		mv.setViewName("sunvote/teacher/teacher_edit");
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools",schools);
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);
 		return mv;
@@ -8,7 +8,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Resource;
+
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.util.AppUtil;
@@ -23,6 +26,8 @@ import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
 import com.fh.util.Jurisdiction;
 import com.fh.util.Tools;
+import com.fh.service.sunvote.grade.GradeManager;
+import com.fh.service.sunvote.subject.SubjectManager;
 import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager;
 /** 
@@ -38,6 +43,11 @@ public class TeachingMaterialController extends BaseController {
 	@Resource(name="teachingmaterialService")
 	private TeachingMaterialManager teachingmaterialService;
+	@Resource(name="gradeService")
+	private GradeManager gradeService;
+	
+	@Resource(name="subjectService")
+	private SubjectManager subjectService;
 	/**保存
 	 * @param
 	 * @throws Exception
@@ -121,6 +131,13 @@ public class TeachingMaterialController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		mv.setViewName("sunvote/teachingmaterial/teachingmaterial_edit");
+		
+		List<PageData>	grades = gradeService.listAll(pd);	
+		mv.addObject("grades", grades);
+		
+		List<PageData>	subjects = subjectService.listAll(pd);
+		mv.addObject("subjects", subjects);
+		
 		mv.addObject("msg", "save");
 		mv.addObject("pd", pd);
 		return mv;
@@ -137,6 +154,10 @@ public class TeachingMaterialController extends BaseController {
 		pd = this.getPageData();
 		pd = teachingmaterialService.findById(pd);	//根据ID读取
 		mv.setViewName("sunvote/teachingmaterial/teachingmaterial_edit");
+		List<PageData>	grades = gradeService.listAll(pd);	
+		mv.addObject("grades", grades);
+		List<PageData>	subjects = subjectService.listAll(pd);
+		mv.addObject("subjects", subjects);
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);
 		return mv;