科组长权限限制

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectClassController.java

@@ -44,9 +44,8 @@ public class ReportSubjectClassController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
-        if (subjectCode != null) {
-            query.setSubjectCode(subjectCode);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
         }
         query.setExamId(examId);
         query.setPageNumber(1);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectCollegeController.java

@@ -43,9 +43,8 @@ public class ReportSubjectCollegeController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
-        if (subjectCode != null) {
-            query.setSubjectCode(subjectCode);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
         }
         query.setExamId(examId);
         query.setPageNumber(1);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectController.java

@@ -43,9 +43,8 @@ public class ReportSubjectController extends BaseExamController {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         query.setExamId(examId);
-        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
-        if (subjectCode != null) {
-            query.setSubjectCode(subjectCode);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
         }
         query = reportSubjectService.findByQuery(query);
         if (query.getCurrentCount() > 0) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectGroupController.java

@@ -48,9 +48,8 @@ public class ReportSubjectGroupController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
-        if (subjectCode != null) {
-            query.setSubjectCode(subjectCode);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
         }
         query.setExamId(examId);
         query.setPageNumber(1);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectQuestionController.java

@@ -47,11 +47,9 @@ public class ReportSubjectQuestionController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
-        if (subjectCode != null) {
-            query.setSubjectCode(subjectCode);
-        }
-        query.setExamId(examId);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }        query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
         if (StringUtils.isNotBlank(query.getSubjectCode())&&query.getObjective()!=null) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

@@ -44,9 +44,8 @@ public class ReportSubjectRangeController extends BaseExamController {
         int examId = getSessionExamId(request);
         // reportSubjectRangeService.saveReportRangeSubjectData(1);
         query.setExamId(examId);
-        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
-        if (subjectCode != null) {
-            query.setSubjectCode(subjectCode);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
         }
         query = reportSubjectRangeService.findByQuery(query);
         if (query.getCurrentCount() > 0) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherClassController.java

@@ -49,11 +49,9 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
-        if (subjectCode != null) {
-            query.setSubjectCode(subjectCode);
-        }
-        query.setExamId(examId);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }        query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
         if (StringUtils.isNotBlank(query.getSubjectCode()) && StringUtils.isNotBlank(query.getTeacherName())) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherController.java

@@ -43,9 +43,8 @@ public class ReportSubjectTeacherController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
-        if (subjectCode != null) {
-            query.setSubjectCode(subjectCode);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
         }
         query.setExamId(examId);
         query.setPageNumber(1);

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/libraryList.jsp

@@ -54,9 +54,9 @@
             <input type="text" name="studentId" id="studentId" value="${query.studentId}" maxlength="10" class="input-medium"onkeyup="this.value=this.value.replace(/\D/g,'')"/>
             &nbsp;
             <label>总分：从</label>
-			<input  type="text" number="true" id="startScroe"  name="startScroe"value="${query.startScroe}" class="input-medium"/>
+			<input  type="text" number="true" id="startScroe"  name="startScroe"value="${query.startScroe}" class="input-medium"onkeyup="this.value=this.value.replace(/\D/g,'')"/>
 			<label> 到&nbsp;&nbsp;&nbsp;</label>
-			<input type="text"  number="true" id="endScroe" name="endScroe"  value="${query.endScroe}"  class="input-medium"/>
+			<input type="text"  number="true" id="endScroe" name="endScroe"  value="${query.endScroe}"  class="input-medium"onkeyup="this.value=this.value.replace(/\D/g,'')"/>
 			
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 		</div>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentList.jsp

@@ -96,11 +96,7 @@
 			<c:if test="${web_user.schoolAdmin==true}">
 			&nbsp;<a href="${ctx}/admin/exam/student/add" class="btn btn-primary">添加</a>
 			&nbsp;<input id="btnImport" class="btn" type="button" value="导入"/>
-			</c:if>
-			<c:if test="${query.totalCount>0 && query.totalCount<=10000}">
-			&nbsp;<input id="export-button" class="btn" type="button" value="导出"/>
-			</c:if>
-			<div class="btn-group">
+			&nbsp;<div class="btn-group">
                         <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
                             导入名单<span class="caret"></span>
                         </a>
@@ -109,6 +105,10 @@
                             <li><a href="##" id="absentBtnImport">缺考名单</a></li>
                         </ul>
             </div>
+			</c:if>
+			<c:if test="${query.totalCount>0 && query.totalCount<=10000}">
+			&nbsp;<input id="export-button" class="btn" type="button" value="导出"/>
+			</c:if>
 		</div>
 	</form>
 	<tags:message content="${message}"/>
@@ -159,11 +159,14 @@
 				</td>
 				<td >
                     <c:if test="${student.breach==true}">
-                        <a href="##" onclick="updateBreach(${student.id});">违纪</a>
+                    	<c:if test="${web_user.schoolAdmin==true}">
+                        <a href="##" onclick="updateBreach(${student.id});">违纪</a></c:if>
+                        <c:if test="${web_user.schoolAdmin!=true}">违纪</c:if>
                     </c:if>
                     <c:if test="${student.breach==false}">
                         正常
                     </c:if>
+                    &nbsp;
                     <c:if test="${student.manualAbsent==true}">
 				    人工指定
 				    </c:if>