孙向锦 / SunvoteEducation

Commit 8ee66e917835e5debc502ee1c30801236d8c912b

Authored by 孙向锦
1 parent 75c39cc6

更新链接

Inline Side-by-side
Showing 20 changed files with 241 additions and 45 deletions
WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_edit.jsp
  View file @8ee66e9
... ... @@ -45,7 +45,13 @@
45 45 </tr>
46 46 <tr>
47 47 <td style="width:75px;text-align: right;padding-top: 13px;">所属教材:</td>
48   - <td><input type="number" name="TEACHINGMATERIAL_ID" id="TEACHINGMATERIAL_ID" value="${pd.TEACHINGMATERIAL_ID}" maxlength="32" placeholder="这里输入所属教材" title="所属教材" style="width:98%;"/></td>
  48 + <td>
  49 + <%-- <input type="number" name="TEACHINGMATERIAL_ID" id="TEACHINGMATERIAL_ID" value="${pd.TEACHINGMATERIAL_ID}" maxlength="32" placeholder="这里输入所属教材" title="所属教材" style="width:98%;"/></td> --%>
  50 + <select class="chosen-select form-control" name="TEACHINGMATERIAL_ID" id="TEACHINGMATERIAL_ID" data-placeholder="这里输入所属年级">
  51 + <c:forEach var="item" items="${teachings}">
  52 + <option value="${item.ID}" <c:if test="${pd.TEACHINGMATERIAL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  53 + </c:forEach>
  54 + </select>
49 55 </tr>
50 56 <tr>
51 57 <td style="text-align: center;" colspan="10">
... ...
WebRoot/WEB-INF/jsp/sunvote/chapter/chapter_list.jsp
  View file @8ee66e9
1 1 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2 2 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
3 3 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
4 5 <%
5 6 String path = request.getContextPath();
6 7 String basePath = request.getScheme() + "://"
... ... @@ -88,7 +89,7 @@
88 89 <td class='center'>${var.NAME}</td>
89 90 <td class='center'>${var.CDESCRIPTION}</td>
90 91 <td class='center'>${var.REMARK}</td>
91   - <td class='center'>${var.TEACHINGMATERIAL_ID}</td>
  92 + <td class='center'>${myelfun:findTeachingmaterialName(var.TEACHINGMATERIAL_ID)}</td>
92 93 <td class="center">
93 94 <c:if test="${QX.edit != 1 && QX.del != 1 }">
94 95 <span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
... ...
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp
  View file @8ee66e9
... ... @@ -33,15 +33,36 @@
33 33 <table id="table_report" class="table table-striped table-bordered table-hover">
34 34 <tr>
35 35 <td style="width:75px;text-align: right;padding-top: 13px;">老师:</td>
36   - <td><input type="number" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}" maxlength="32" placeholder="这里输入老师" title="老师" style="width:98%;"/></td>
  36 + <td>
  37 + <%-- <input type="number" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}" maxlength="32" placeholder="这里输入老师" title="老师" style="width:98%;"/></td> --%>
  38 + <select class="chosen-select form-control" name="TEACHER_ID" id="TEACHER_ID" data-placeholder="这里输入班级类型">
  39 + <c:forEach var="item" items="${teachers}">
  40 + <option value="${item.ID}" <c:if test="${pd.TEACHER_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  41 + </c:forEach>
  42 + </select>
  43 + </td>
37 44 </tr>
38 45 <tr>
39   - <td style="width:75px;text-align: right;padding-top: 13px;">班级ID:</td>
40   - <td><input type="number" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}" maxlength="32" placeholder="这里输入班级ID" title="班级ID" style="width:98%;"/></td>
  46 + <td style="width:75px;text-align: right;padding-top: 13px;">班级:</td>
  47 + <td>
  48 + <%-- <input type="number" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}" maxlength="32" placeholder="这里输入班级ID" title="班级ID" style="width:98%;"/></td> --%>
  49 + <select class="chosen-select form-control" name="CLASS_ID" id="CLASS_ID" data-placeholder="这里输入班级类型">
  50 + <c:forEach var="item" items="${classs}">
  51 + <option value="${item.ID}" <c:if test="${pd.CLASS_ID==item.ID}">selected="true"</c:if>>${item.CLASS_NAME}</option>
  52 + </c:forEach>
  53 + </select>
  54 + </td>
41 55 </tr>
42 56 <tr>
43 57 <td style="width:75px;text-align: right;padding-top: 13px;">科目:</td>
44   - <td><input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td>
  58 + <td>
  59 + <%-- <input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td> --%>
  60 + <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入班级类型">
  61 + <c:forEach var="item" items="${subjects}">
  62 + <option value="${item.ID}" <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
  63 + </c:forEach>
  64 + </select>
  65 + </td>
45 66 </tr>
46 67 <tr>
47 68 <td style="width:75px;text-align: right;padding-top: 13px;">开始时间:</td>
... ...
WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_list.jsp
  View file @8ee66e9
1 1 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2 2 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
3 3 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
4 5 <%
5 6 String path = request.getContextPath();
6 7 String basePath = request.getScheme() + "://"
... ... @@ -67,7 +68,7 @@
67 68 </th>
68 69 <th class="center" style="width:50px;">序号</th>
69 70 <th class="center">老师</th>
70   - <th class="center">班级ID</th>
  71 + <th class="center">班级</th>
71 72 <th class="center">科目</th>
72 73 <th class="center">开始时间</th>
73 74 <th class="center">结束时间</th>
... ... @@ -87,9 +88,9 @@
87 88 <label class="pos-rel"><input type='checkbox' name='ids' value="${var.ID}" class="ace" /><span class="lbl"></span></label>
88 89 </td>
89 90 <td class='center' style="width: 30px;">${vs.index+1}</td>
90   - <td class='center'>${var.TEACHER_ID}</td>
91   - <td class='center'>${var.CLASS_ID}</td>
92   - <td class='center'>${var.SUBJECT_ID}</td>
  91 + <td class='center'>${myelfun:findTeacherName(var.TEACHER_ID)}</td>
  92 + <td class='center'>${myelfun:findClassName(var.CLASS_ID)}</td>
  93 + <td class='center'>${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
93 94 <td class='center'>${var.START_DATE}</td>
94 95 <td class='center'>${var.END_DATE}</td>
95 96 <td class='center'>${var.REMARK}</td>
... ...
WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_edit.jsp
  View file @8ee66e9
... ... @@ -41,11 +41,22 @@
41 41 </tr>
42 42 <tr>
43 43 <td style="width:75px;text-align: right;padding-top: 13px;">是否正常:</td>
44   - <td><input type="number" name="IS_OK" id="IS_OK" value="${pd.IS_OK}" maxlength="32" placeholder="这里输入是否正常" title="是否正常" style="width:98%;"/></td>
  44 + <td>
  45 + <select class="chosen-select form-control" name="IS_OK" id="IS_OK" data-placeholder="这里输入所属年级">
  46 + <option value="1" <c:if test="${pd.IS_OK== 1}">selected="true"</c:if>>正常</option>
  47 + <option value="0" <c:if test="${pd.IS_OK== 0}">selected="true"</c:if>>损坏</option>
  48 + </select>
  49 + </td>
  50 + <%-- <input type="number" name="IS_OK" id="IS_OK" value="${pd.IS_OK}" maxlength="32" placeholder="这里输入是否正常" title="是否正常" style="width:98%;"/></td> --%>
45 51 </tr>
46 52 <tr>
47 53 <td style="width:75px;text-align: right;padding-top: 13px;">工作模式:</td>
48   - <td><input type="number" name="WORK_MODE" id="WORK_MODE" value="${pd.WORK_MODE}" maxlength="32" placeholder="这里输入工作模式" title="工作模式" style="width:98%;"/></td>
  54 + <td>
  55 + <%-- <input type="number" name="WORK_MODE" id="WORK_MODE" value="${pd.WORK_MODE}" maxlength="32" placeholder="这里输入工作模式" title="工作模式" style="width:98%;"/></td> --%>
  56 + <select class="chosen-select form-control" name="WORK_MODE" id="WORK_MODE" data-placeholder="这里输入所属年级">
  57 + <option value="1" <c:if test="${pd.WORK_MODE== 1}">selected="true"</c:if>>RF模式</option>
  58 + <option value="2" <c:if test="${pd.WORK_MODE== 2}">selected="true"</c:if>>433模式</option>
  59 + </select>
49 60 </tr>
50 61 <tr>
51 62 <td style="width:75px;text-align: right;padding-top: 13px;">生产时间:</td>
... ...
WebRoot/WEB-INF/jsp/sunvote/keypad/keypad_list.jsp
  View file @8ee66e9
... ... @@ -88,8 +88,8 @@
88 88 <td class='center' style="width: 30px;">${vs.index+1}</td>
89 89 <td class='center'>${var.NO}</td>
90 90 <td class='center'>${var.SN}</td>
91   - <td class='center'>${var.IS_OK}</td>
92   - <td class='center'>${var.WORK_MODE}</td>
  91 + <td class='center'>${var.IS_OK == 1 ? "正常":"损坏"}</td>
  92 + <td class='center'>${var.WORK_MODE == 1 ? "RF模式" : "433模式"}</td>
93 93 <td class='center'>${var.PRODUCT_DATE}</td>
94 94 <td class="center">
95 95 <c:if test="${QX.edit != 1 && QX.del != 1 }">
... ...
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit.jsp
  View file @8ee66e9
... ... @@ -33,15 +33,37 @@
33 33 <table id="table_report" class="table table-striped table-bordered table-hover">
34 34 <tr>
35 35 <td style="width:75px;text-align: right;padding-top: 13px;">所属学校:</td>
36   - <td><input type="text" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="255" placeholder="这里输入所属学校" title="所属学校" style="width:98%;"/></td>
  36 + <td>
  37 + <%-- <input type="text" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="255" placeholder="这里输入所属学校" title="所属学校" style="width:98%;"/> --%>
  38 +
  39 + <select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" data-placeholder="这里输入所属学校">
  40 + <c:forEach var="item" items="${schools}">
  41 + <option value="${item.ID}" <c:if test="${pd.SCHOOL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  42 + </c:forEach>
  43 + </select>
  44 + </td>
37 45 </tr>
38 46 <tr>
39 47 <td style="width:75px;text-align: right;padding-top: 13px;">所属年级:</td>
40   - <td><input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td>
  48 + <td>
  49 + <%-- <input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td> --%>
  50 + <select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入所属年级">
  51 + <c:forEach var="item" items="${grades}">
  52 + <option value="${item.ID}" <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  53 + </c:forEach>
  54 + </select>
  55 + </td>
41 56 </tr>
42 57 <tr>
43 58 <td style="width:75px;text-align: right;padding-top: 13px;">班级类型:</td>
44   - <td><input type="text" name="CLASS_TYPE" id="CLASS_TYPE" value="${pd.CLASS_TYPE}" maxlength="255" placeholder="这里输入班级类型" title="班级类型" style="width:98%;"/></td>
  59 + <td>
  60 + <%-- <input type="text" name="CLASS_TYPE" id="CLASS_TYPE" value="${pd.CLASS_TYPE}" maxlength="255" placeholder="这里输入班级类型" title="班级类型" style="width:98%;"/></td> --%>
  61 + <select class="chosen-select form-control" name="CLASS_TYPE" id="CLASS_TYPE" data-placeholder="这里输入班级类型">
  62 + <c:forEach var="item" items="${classTypes}">
  63 + <option value="${item.ID}" <c:if test="${pd.CLASS_TYPE==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  64 + </c:forEach>
  65 + </select>
  66 + </td>
45 67 </tr>
46 68 <tr>
47 69 <td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td>
... ... @@ -53,7 +75,14 @@
53 75 </tr>
54 76 <tr>
55 77 <td style="width:75px;text-align: right;padding-top: 13px;">班级基站:</td>
56   - <td><input type="text" name="BASESTATION_ID" id="BASESTATION_ID" value="${pd.BASESTATION_ID}" maxlength="255" placeholder="这里输入班级基站" title="班级基站" style="width:98%;"/></td>
  78 + <td>
  79 + <%-- <input type="text" name="BASESTATION_ID" id="BASESTATION_ID" value="${pd.BASESTATION_ID}" maxlength="255" placeholder="这里输入班级基站" title="班级基站" style="width:98%;"/></td> --%>
  80 + <select class="chosen-select form-control" name="BASESTATION_ID" id="BASESTATION_ID" data-placeholder="这里输入班级基站">
  81 + <c:forEach var="item" items="${basestations}">
  82 + <option value="${item.ID}" <c:if test="${pd.BASESTATION_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  83 + </c:forEach>
  84 + </select>
  85 + </td>
57 86 </tr>
58 87 <tr>
59 88 <td style="text-align: center;" colspan="10">
... ...
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list.jsp
  View file @8ee66e9
1 1 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2 2 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
3 3 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
  5 +
4 6 <%
5 7 String path = request.getContextPath();
6 8 String basePath = request.getScheme() + "://"
... ... @@ -87,12 +89,12 @@
87 89 <label class="pos-rel"><input type='checkbox' name='ids' value="${var.ID}" class="ace" /><span class="lbl"></span></label>
88 90 </td>
89 91 <td class='center' style="width: 30px;">${vs.index+1}</td>
90   - <td class='center'>${var.SCHOOL_ID}</td>
91   - <td class='center'>${var.GRADE_ID}</td>
92   - <td class='center'>${var.CLASS_TYPE}</td>
  92 + <td class='center'>${myelfun:findSchoolName(var.SCHOOL_ID)}</td>
  93 + <td class='center'>${myelfun:findGradeName(var.GRADE_ID)}</td>
  94 + <td class='center'>${myelfun:findClassTypeName(var.CLASS_TYPE)}</td>
93 95 <td class='center'>${var.CLASS_NAME}</td>
94 96 <td class='center'>${var.CLASS_CODE}</td>
95   - <td class='center'>${var.BASESTATION_ID}</td>
  97 + <td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td>
96 98 <td class="center">
97 99 <c:if test="${QX.edit != 1 && QX.del != 1 }">
98 100 <span class="label label-large label-grey arrowed-in-right arrowed-in"><i class="ace-icon fa fa-lock" title="无权限"></i></span>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit.jsp
  View file @8ee66e9
... ... @@ -33,7 +33,14 @@
33 33 <table id="table_report" class="table table-striped table-bordered table-hover">
34 34 <tr>
35 35 <td style="width:75px;text-align: right;padding-top: 13px;">所在学校:</td>
36   - <td><input type="number" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="32" placeholder="这里输入所在学校" title="所在学校" style="width:98%;"/></td>
  36 + <td>
  37 + <select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" data-placeholder="这里输入所属学校">
  38 + <c:forEach var="item" items="${schools}">
  39 + <option value="${item.ID}" <c:if test="${pd.SCHOOL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  40 + </c:forEach>
  41 + </select>
  42 + </td>
  43 + <%-- <input type="number" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="32" placeholder="这里输入所在学校" title="所在学校" style="width:98%;"/></td> --%>
37 44 </tr>
38 45 <tr>
39 46 <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
... ... @@ -57,11 +64,17 @@
57 64 </tr>
58 65 <tr>
59 66 <td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
60   - <td><input type="text" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
  67 + <td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
61 68 </tr>
62 69 <tr>
63 70 <td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
64   - <td><input type="number" name="SEX" id="SEX" value="${pd.SEX}" maxlength="32" placeholder="这里输入性别" title="性别" style="width:98%;"/></td>
  71 + <td>
  72 + <select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="选择性别">
  73 + <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>
  74 + <option value="2" <c:if test="${pd.SEX==2}">selected="true"</c:if>>女</option>
  75 + </select>
  76 + </td>
  77 + <%-- <input type="number" name="SEX" id="SEX" value="${pd.SEX}" maxlength="32" placeholder="这里输入性别" title="性别" style="width:98%;"/></td> --%>
65 78 </tr>
66 79 <tr>
67 80 <td style="width:75px;text-align: right;padding-top: 13px;">科目列表:</td>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list.jsp
  View file @8ee66e9
1 1 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2 2 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
3 3 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
4 5 <%
5 6 String path = request.getContextPath();
6 7 String basePath = request.getScheme() + "://"
... ... @@ -72,7 +73,6 @@
72 73 <th class="center">座机电话</th>
73 74 <th class="center">证件号</th>
74 75 <th class="center">账号</th>
75   - <th class="center">密码</th>
76 76 <th class="center">性别</th>
77 77 <th class="center">科目列表</th>
78 78 <th class="center">教师卡编号</th>
... ... @@ -91,14 +91,13 @@
91 91 <label class="pos-rel"><input type='checkbox' name='ids' value="${var.ID}" class="ace" /><span class="lbl"></span></label>
92 92 </td>
93 93 <td class='center' style="width: 30px;">${vs.index+1}</td>
94   - <td class='center'>${var.SCHOOL_ID}</td>
  94 + <td class='center'>${myelfun:findSchoolName(var.SCHOOL_ID)}</td>
95 95 <td class='center'>${var.NAME}</td>
96 96 <td class='center'>${var.PHONE}</td>
97 97 <td class='center'>${var.SEAT_PHONE}</td>
98 98 <td class='center'>${var.CARD_NO}</td>
99 99 <td class='center'>${var.ACCOUT}</td>
100   - <td class='center'>${var.PASSWORD}</td>
101   - <td class='center'>${var.SEX}</td>
  100 + <td class='center'>${var.SEX == 1? "男":"女"}</td>
102 101 <td class='center'>${var.SUBJECT_IDS}</td>
103 102 <td class='center'>${var.KEYPAD_ID}</td>
104 103 <td class="center">
... ...
WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_edit.jsp
  View file @8ee66e9
... ... @@ -2,6 +2,7 @@
2 2 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
3 3 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
4 4 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
  5 +
5 6 <%
6 7 String path = request.getContextPath();
7 8 String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
... ... @@ -37,11 +38,25 @@
37 38 </tr>
38 39 <tr>
39 40 <td style="width:75px;text-align: right;padding-top: 13px;">所属科目:</td>
40   - <td><input type="text" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="255" placeholder="这里输入所属科目" title="所属科目" style="width:98%;"/></td>
  41 + <td>
  42 + <select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属科目">
  43 + <c:forEach var="item" items="${subjects}">
  44 + <option value="${item.ID}" <c:if test="${pd.SUBJECT_ID==item.ID}">selected="true"</c:if>>${item.CNAME}</option>
  45 + </c:forEach>
  46 + </select>
  47 + </td>
  48 + <%-- <input type="text" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="255" placeholder="这里输入所属科目" title="所属科目" style="width:98%;"/></td> --%>
41 49 </tr>
42 50 <tr>
43 51 <td style="width:75px;text-align: right;padding-top: 13px;">所属年级:</td>
44   - <td><input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td>
  52 + <td>
  53 + <select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入所属科目">
  54 + <c:forEach var="item" items="${grades}">
  55 + <option value="${item.ID}" <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
  56 + </c:forEach>
  57 + </select>
  58 + </td>
  59 + <%-- <input type="text" name="GRADE_ID" id="GRADE_ID" value="${pd.GRADE_ID}" maxlength="255" placeholder="这里输入所属年级" title="所属年级" style="width:98%;"/></td> --%>
45 60 </tr>
46 61 <tr>
47 62 <td style="width:75px;text-align: right;padding-top: 13px;">教材版本号:</td>
... ...
WebRoot/WEB-INF/jsp/sunvote/teachingmaterial/teachingmaterial_list.jsp
  View file @8ee66e9
1 1 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
2 2 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
3 3 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
4 5 <%
5 6 String path = request.getContextPath();
6 7 String basePath = request.getScheme() + "://"
... ... @@ -87,8 +88,8 @@
87 88 </td>
88 89 <td class='center' style="width: 30px;">${vs.index+1}</td>
89 90 <td class='center'>${var.NAME}</td>
90   - <td class='center'>${var.SUBJECT_ID}</td>
91   - <td class='center'>${var.GRADE_ID}</td>
  91 + <td class='center'>${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
  92 + <td class='center'>${myelfun:findGradeName(var.GRADE_ID)}</td>
92 93 <td class='center'>${var.VERSION_CODE}</td>
93 94 <td class='center'>${var.VERSION_NAME}</td>
94 95 <td class="center">
... ...
resources/mybatis1/sunvote/TeachingMaterialMapper.xml
  View file @8ee66e9
... ... @@ -32,9 +32,17 @@
32 32 insert into
33 33 <include refid="tableName"></include>
34 34 (
35   - <include refid="Field"></include>
  35 + NAME,
  36 + SUBJECT_ID,
  37 + GRADE_ID,
  38 + VERSION_CODE,
  39 + VERSION_NAME
36 40 ) values (
37   - <include refid="FieldValue"></include>
  41 + #{NAME},
  42 + #{SUBJECT_ID},
  43 + #{GRADE_ID},
  44 + #{VERSION_CODE},
  45 + #{VERSION_NAME}
38 46 )
39 47 </insert>
40 48  
... ... @@ -56,7 +64,7 @@
56 64 GRADE_ID = #{GRADE_ID},
57 65 VERSION_CODE = #{VERSION_CODE},
58 66 VERSION_NAME = #{VERSION_NAME},
59   - ID = ID
  67 + ID = #{ID}
60 68 where
61 69 ID = #{ID}
62 70 </update>
... ...
resources/spring/ApplicationContext-main.xml
  View file @8ee66e9
... ... @@ -34,4 +34,6 @@
34 34 </property>
35 35 </bean>
36 36  
  37 + <bean id="springBeanFactoryUtils" class="com.fh.util.SpringBeanFactoryUtils"/>
  38 +
37 39 </beans>
... ...
src/com/fh/controller/api/ApiServer.java
  View file @8ee66e9
... ... @@ -28,14 +28,6 @@ public class ApiServer extends BaseController {
28 28 private KeypadManager keypadService;
29 29  
30 30  
31   - @RequestMapping(value="/*" ,produces="application/json;charset=UTF-8")
32   - @ResponseBody
33   - public Object Default() throws Exception{
34   - ResponseGson<Void> respone = new ResponseGson();
35   - respone.setPathError();
36   - return respone.toJson();
37   - }
38   -
39 31 @RequestMapping(value="/school" ,produces="application/json;charset=UTF-8")
40 32 @ResponseBody
41 33 public Object schoolDefault() throws Exception{
... ...
src/com/fh/controller/sunvote/chapter/ChapterController.java
  View file @8ee66e9
... ... @@ -8,7 +8,9 @@ import java.util.Date;
8 8 import java.util.HashMap;
9 9 import java.util.List;
10 10 import java.util.Map;
  11 +
11 12 import javax.annotation.Resource;
  13 +
12 14 import org.springframework.beans.propertyeditors.CustomDateEditor;
13 15 import org.springframework.stereotype.Controller;
14 16 import org.springframework.web.bind.WebDataBinder;
... ... @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
16 18 import org.springframework.web.bind.annotation.RequestMapping;
17 19 import org.springframework.web.bind.annotation.ResponseBody;
18 20 import org.springframework.web.servlet.ModelAndView;
  21 +
19 22 import com.fh.controller.base.BaseController;
20 23 import com.fh.entity.Page;
21 24 import com.fh.util.AppUtil;
... ... @@ -24,6 +27,7 @@ import com.fh.util.PageData;
24 27 import com.fh.util.Jurisdiction;
25 28 import com.fh.util.Tools;
26 29 import com.fh.service.sunvote.chapter.ChapterManager;
  30 +import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager;
27 31  
28 32 /**
29 33 * 说明：章节管理
... ... @@ -38,6 +42,9 @@ public class ChapterController extends BaseController {
38 42 @Resource(name="chapterService")
39 43 private ChapterManager chapterService;
40 44  
  45 + @Resource(name="teachingmaterialService")
  46 + private TeachingMaterialManager teachingmaterialService;
  47 +
41 48 /**保存
42 49 * @param
43 50 * @throws Exception
... ... @@ -121,6 +128,10 @@ public class ChapterController extends BaseController {
121 128 PageData pd = new PageData();
122 129 pd = this.getPageData();
123 130 mv.setViewName("sunvote/chapter/chapter_edit");
  131 +
  132 + List<PageData> teachings = teachingmaterialService.listAll(pd);
  133 + mv.addObject("teachings", teachings);
  134 +
124 135 mv.addObject("msg", "save");
125 136 mv.addObject("pd", pd);
126 137 return mv;
... ... @@ -137,6 +148,10 @@ public class ChapterController extends BaseController {
137 148 pd = this.getPageData();
138 149 pd = chapterService.findById(pd); //根据ID读取
139 150 mv.setViewName("sunvote/chapter/chapter_edit");
  151 +
  152 + List<PageData> teachings = teachingmaterialService.listAll(pd);
  153 + mv.addObject("teachings", teachings);
  154 +
140 155 mv.addObject("msg", "edit");
141 156 mv.addObject("pd", pd);
142 157 return mv;
... ...
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
  View file @8ee66e9
... ... @@ -8,7 +8,9 @@ import java.util.Date;
8 8 import java.util.HashMap;
9 9 import java.util.List;
10 10 import java.util.Map;
  11 +
11 12 import javax.annotation.Resource;
  13 +
12 14 import org.springframework.beans.propertyeditors.CustomDateEditor;
13 15 import org.springframework.stereotype.Controller;
14 16 import org.springframework.web.bind.WebDataBinder;
... ... @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
16 18 import org.springframework.web.bind.annotation.RequestMapping;
17 19 import org.springframework.web.bind.annotation.ResponseBody;
18 20 import org.springframework.web.servlet.ModelAndView;
  21 +
19 22 import com.fh.controller.base.BaseController;
20 23 import com.fh.entity.Page;
21 24 import com.fh.util.AppUtil;
... ... @@ -24,6 +27,9 @@ import com.fh.util.PageData;
24 27 import com.fh.util.Jurisdiction;
25 28 import com.fh.util.Tools;
26 29 import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
  30 +import com.fh.service.sunvote.sclass.SClassManager;
  31 +import com.fh.service.sunvote.subject.SubjectManager;
  32 +import com.fh.service.sunvote.teacher.TeacherManager;
27 33  
28 34 /**
29 35 * 说明：任课管理
... ... @@ -38,6 +44,15 @@ public class CourseManagementController extends BaseController {
38 44 @Resource(name="coursemanagementService")
39 45 private CourseManagementManager coursemanagementService;
40 46  
  47 + @Resource(name="teacherService")
  48 + private TeacherManager teacherService;
  49 +
  50 + @Resource(name="sclassService")
  51 + private SClassManager sclassService;
  52 +
  53 + @Resource(name="subjectService")
  54 + private SubjectManager subjectService;
  55 +
41 56 /**保存
42 57 * @param
43 58 * @throws Exception
... ... @@ -121,6 +136,14 @@ public class CourseManagementController extends BaseController {
121 136 PageData pd = new PageData();
122 137 pd = this.getPageData();
123 138 mv.setViewName("sunvote/coursemanagement/coursemanagement_edit");
  139 +
  140 + List<PageData> teachers = teacherService.listAll(pd);
  141 + mv.addObject("teachers",teachers);
  142 + List<PageData> classs = sclassService.listAll(pd);
  143 + mv.addObject("classs",classs);
  144 + List<PageData> subjects = subjectService.listAll(pd);
  145 + mv.addObject("subjects", subjects);
  146 +
124 147 mv.addObject("msg", "save");
125 148 mv.addObject("pd", pd);
126 149 return mv;
... ... @@ -137,6 +160,13 @@ public class CourseManagementController extends BaseController {
137 160 pd = this.getPageData();
138 161 pd = coursemanagementService.findById(pd); //根据ID读取
139 162 mv.setViewName("sunvote/coursemanagement/coursemanagement_edit");
  163 + List<PageData> teachers = teacherService.listAll(pd);
  164 + mv.addObject("teachers",teachers);
  165 + List<PageData> classs = sclassService.listAll(pd);
  166 + mv.addObject("classs",classs);
  167 + List<PageData> subjects = subjectService.listAll(pd);
  168 + mv.addObject("subjects", subjects);
  169 +
140 170 mv.addObject("msg", "edit");
141 171 mv.addObject("pd", pd);
142 172 return mv;
... ...
src/com/fh/controller/sunvote/sclass/SClassController.java
  View file @8ee66e9
... ... @@ -125,8 +125,8 @@ public class SClassController extends BaseController {
125 125 pd.put("keywords", keywords.trim());
126 126 }
127 127 page.setPd(pd);
128   - List<PageData> varList = sclassService.list(page); //列出SClass列表
129 128 mv.setViewName("sunvote/sclass/sclass_list");
  129 + List<PageData> varList = sclassService.list(page); //列出SClass列表
130 130 mv.addObject("varList", varList);
131 131 mv.addObject("pd", pd);
132 132 mv.addObject("QX",Jurisdiction.getHC()); //按钮权限
... ... @@ -143,6 +143,14 @@ public class SClassController extends BaseController {
143 143 PageData pd = new PageData();
144 144 pd = this.getPageData();
145 145 mv.setViewName("sunvote/sclass/sclass_edit");
  146 + List<PageData> schools = schoolService.listAll(pd);
  147 + mv.addObject("schools",schools);
  148 + List<PageData> basestations = basestationService.listAll(pd);
  149 + mv.addObject("basestations",basestations);
  150 + List<PageData> grades = gradeService.listAll(pd);
  151 + mv.addObject("grades", grades);
  152 + List<PageData> classTypes = classtypeService.listAll(pd);
  153 + mv.addObject("classTypes", classTypes);
146 154 mv.addObject("msg", "save");
147 155 mv.addObject("pd", pd);
148 156 return mv;
... ... @@ -159,6 +167,14 @@ public class SClassController extends BaseController {
159 167 pd = this.getPageData();
160 168 pd = sclassService.findById(pd); //根据ID读取
161 169 mv.setViewName("sunvote/sclass/sclass_edit");
  170 + List<PageData> schools = schoolService.listAll(pd);
  171 + mv.addObject("schools",schools);
  172 + List<PageData> basestations = basestationService.listAll(pd);
  173 + mv.addObject("basestations",basestations);
  174 + List<PageData> grades = gradeService.listAll(pd);
  175 + mv.addObject("grades", grades);
  176 + List<PageData> classTypes = classtypeService.listAll(pd);
  177 + mv.addObject("classTypes", classTypes);
162 178 mv.addObject("msg", "edit");
163 179 mv.addObject("pd", pd);
164 180 return mv;
... ...
src/com/fh/controller/sunvote/teacher/TeacherController.java
  View file @8ee66e9
... ... @@ -8,7 +8,9 @@ import java.util.Date;
8 8 import java.util.HashMap;
9 9 import java.util.List;
10 10 import java.util.Map;
  11 +
11 12 import javax.annotation.Resource;
  13 +
12 14 import org.springframework.beans.propertyeditors.CustomDateEditor;
13 15 import org.springframework.stereotype.Controller;
14 16 import org.springframework.web.bind.WebDataBinder;
... ... @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
16 18 import org.springframework.web.bind.annotation.RequestMapping;
17 19 import org.springframework.web.bind.annotation.ResponseBody;
18 20 import org.springframework.web.servlet.ModelAndView;
  21 +
19 22 import com.fh.controller.base.BaseController;
20 23 import com.fh.entity.Page;
21 24 import com.fh.util.AppUtil;
... ... @@ -23,6 +26,7 @@ import com.fh.util.ObjectExcelView;
23 26 import com.fh.util.PageData;
24 27 import com.fh.util.Jurisdiction;
25 28 import com.fh.util.Tools;
  29 +import com.fh.service.sunvote.school.SchoolManager;
26 30 import com.fh.service.sunvote.teacher.TeacherManager;
27 31  
28 32 /**
... ... @@ -38,6 +42,9 @@ public class TeacherController extends BaseController {
38 42 @Resource(name="teacherService")
39 43 private TeacherManager teacherService;
40 44  
  45 + @Resource(name="schoolService")
  46 + private SchoolManager schoolService;
  47 +
41 48 /**保存
42 49 * @param
43 50 * @throws Exception
... ... @@ -121,6 +128,10 @@ public class TeacherController extends BaseController {
121 128 PageData pd = new PageData();
122 129 pd = this.getPageData();
123 130 mv.setViewName("sunvote/teacher/teacher_edit");
  131 +
  132 + List<PageData> schools = schoolService.listAll(pd);
  133 + mv.addObject("schools",schools);
  134 +
124 135 mv.addObject("msg", "save");
125 136 mv.addObject("pd", pd);
126 137 return mv;
... ... @@ -137,6 +148,8 @@ public class TeacherController extends BaseController {
137 148 pd = this.getPageData();
138 149 pd = teacherService.findById(pd); //根据ID读取
139 150 mv.setViewName("sunvote/teacher/teacher_edit");
  151 + List<PageData> schools = schoolService.listAll(pd);
  152 + mv.addObject("schools",schools);
140 153 mv.addObject("msg", "edit");
141 154 mv.addObject("pd", pd);
142 155 return mv;
... ...
src/com/fh/controller/sunvote/teachingmaterial/TeachingMaterialController.java
  View file @8ee66e9
... ... @@ -8,7 +8,9 @@ import java.util.Date;
8 8 import java.util.HashMap;
9 9 import java.util.List;
10 10 import java.util.Map;
  11 +
11 12 import javax.annotation.Resource;
  13 +
12 14 import org.springframework.beans.propertyeditors.CustomDateEditor;
13 15 import org.springframework.stereotype.Controller;
14 16 import org.springframework.web.bind.WebDataBinder;
... ... @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.InitBinder;
16 18 import org.springframework.web.bind.annotation.RequestMapping;
17 19 import org.springframework.web.bind.annotation.ResponseBody;
18 20 import org.springframework.web.servlet.ModelAndView;
  21 +
19 22 import com.fh.controller.base.BaseController;
20 23 import com.fh.entity.Page;
21 24 import com.fh.util.AppUtil;
... ... @@ -23,6 +26,8 @@ import com.fh.util.ObjectExcelView;
23 26 import com.fh.util.PageData;
24 27 import com.fh.util.Jurisdiction;
25 28 import com.fh.util.Tools;
  29 +import com.fh.service.sunvote.grade.GradeManager;
  30 +import com.fh.service.sunvote.subject.SubjectManager;
26 31 import com.fh.service.sunvote.teachingmaterial.TeachingMaterialManager;
27 32  
28 33 /**
... ... @@ -38,6 +43,11 @@ public class TeachingMaterialController extends BaseController {
38 43 @Resource(name="teachingmaterialService")
39 44 private TeachingMaterialManager teachingmaterialService;
40 45  
  46 + @Resource(name="gradeService")
  47 + private GradeManager gradeService;
  48 +
  49 + @Resource(name="subjectService")
  50 + private SubjectManager subjectService;
41 51 /**保存
42 52 * @param
43 53 * @throws Exception
... ... @@ -121,6 +131,13 @@ public class TeachingMaterialController extends BaseController {
121 131 PageData pd = new PageData();
122 132 pd = this.getPageData();
123 133 mv.setViewName("sunvote/teachingmaterial/teachingmaterial_edit");
  134 +
  135 + List<PageData> grades = gradeService.listAll(pd);
  136 + mv.addObject("grades", grades);
  137 +
  138 + List<PageData> subjects = subjectService.listAll(pd);
  139 + mv.addObject("subjects", subjects);
  140 +
124 141 mv.addObject("msg", "save");
125 142 mv.addObject("pd", pd);
126 143 return mv;
... ... @@ -137,6 +154,10 @@ public class TeachingMaterialController extends BaseController {
137 154 pd = this.getPageData();
138 155 pd = teachingmaterialService.findById(pd); //根据ID读取
139 156 mv.setViewName("sunvote/teachingmaterial/teachingmaterial_edit");
  157 + List<PageData> grades = gradeService.listAll(pd);
  158 + mv.addObject("grades", grades);
  159 + List<PageData> subjects = subjectService.listAll(pd);
  160 + mv.addObject("subjects", subjects);
140 161 mv.addObject("msg", "edit");
141 162 mv.addObject("pd", pd);
142 163 return mv;
... ...