修复小题分为0.55的问题；禁止科组长查询考生信息

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/SubjectQuestionDTO.java

@@ -1,14 +1,8 @@
 package cn.com.qmth.stmms.admin.dto;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -68,16 +62,17 @@ public class SubjectQuestionDTO {
             } else {
                 MarkGroup group = groups.get(question.getGroupNumber());
                 if (group == null) {
-                    group = new MarkGroup(examId, subjectCode, question.getGroupNumber(), MarkConfigItem.parse(question
-                            .getPicList()), 0d, question.getDoubleRate(), question.getArbitrateThreshold(),
-                            question.getScorePolicy(), question.getMarkMode(), question.getTrialCount(), false, false,
-                            1, false);
+                    group = new MarkGroup(examId, subjectCode, question.getGroupNumber(),
+                            MarkConfigItem.parse(question.getPicList()), 0d, question.getDoubleRate(),
+                            question.getArbitrateThreshold(), question.getScorePolicy(), question.getMarkMode(),
+                            question.getTrialCount(), false, false, 1, false);
                     group.setImportQuestionList(new LinkedList<>());
                     groups.put(question.getGroupNumber(), group);
                 }
                 group.getImportQuestionList().add(question);
-                this.trialCount = question.getTrialCount() != null && question.getTrialCount() > 0 ? question
-                        .getTrialCount() : 0;
+                this.trialCount = question.getTrialCount() != null && question.getTrialCount() > 0
+                        ? question.getTrialCount()
+                        : 0;
                 // group.setTotalScore(group.getTotalScore() +
                 // question.getTotalScore());
                 // totalScore += question.getTotalScore();
@@ -136,13 +131,12 @@ public class SubjectQuestionDTO {
                         error.add("[" + subjectCode + "] 有满分为空的记录");
                         return false;
                     }
-                    int score = (int) (question.getTotalScore() * 100);
-                    if ((question.getTotalScore() * 100) - score > 0) {
+                    if (countDecimalPlaces(question.getTotalScore()) > 2) {
                         error.add("[" + subjectCode + "] 有满分为小数超2位的记录");
                         return false;
                     }
-                    if (!objective
-                            && (question.getIntervalScore() * 100) - (int) (question.getIntervalScore() * 100) > 0) {
+
+                    if (!objective && countDecimalPlaces(question.getIntervalScore()) > 2) {
                         error.add("[" + subjectCode + "] 有间隔分为小数超2位的记录");
                         return false;
                     }
@@ -237,6 +231,15 @@ public class SubjectQuestionDTO {
         }
     }
 
+    public int countDecimalPlaces(double number) {
+        String num = Double.toString(number);
+        int decimalPointIndex = num.indexOf('.');
+        if (decimalPointIndex == -1) {
+            return 0;
+        }
+        return num.length() - decimalPointIndex - 1;
+    }
+
     private String check(List<ExamQuestion> questions, List<ExamQuestion> value) {
         if (questions.size() != value.size()) {
             return "题目总数不一致";
@@ -250,8 +253,8 @@ public class SubjectQuestionDTO {
                 if (subCount != null) {
                     subCountMap.put(question.getMainNumber(), subCount + 1);
                     Double mainScore = mainScoreMap.get(question.getMainNumber());
-                    mainScoreMap
-                            .put(question.getMainNumber(), BigDecimalUtils.add(mainScore, question.getTotalScore()));
+                    mainScoreMap.put(question.getMainNumber(),
+                            BigDecimalUtils.add(mainScore, question.getTotalScore()));
                 } else {
                     subCountMap.put(question.getMainNumber(), 1);
                     mainScoreMap.put(question.getMainNumber(), question.getTotalScore());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/PaperController.java

@@ -848,8 +848,7 @@ public class PaperController extends BaseExamController {
     }
 
     private boolean validate(ExamQuestion question, List<String> error, Map<Integer, String> titleMap) {
-        int score = (int) (question.getTotalScore() * 100);
-        if ((question.getTotalScore() * 100) - score > 0) {
+        if (countDecimalPlaces(question.getTotalScore()) > 2) {
             error.add("有满分为小数超2位的记录");
             return false;
         }
@@ -881,6 +880,15 @@ public class PaperController extends BaseExamController {
         return true;
     }
 
+    public int countDecimalPlaces(double number) {
+        String num = Double.toString(number);
+        int decimalPointIndex = num.indexOf('.');
+        if (decimalPointIndex == -1) {
+            return 0;
+        }
+        return num.length() - decimalPointIndex - 1;
+    }
+
     @Logging(menu = "导入数据包", type = LogType.IMPORT_FILE)
     @RequestMapping(value = "/importData", method = RequestMethod.POST)
     @RoleRequire(Role.SCHOOL_ADMIN)

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

@@ -1,193 +1,204 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-	<title>仲裁管理</title>
-	<meta name="decorator" content="default"/>
-	<%@include file="/WEB-INF/views/include/head.jsp" %>
-	<style type="text/css">.sort{color:#0663A2;cursor:pointer;}</style>
+    <title>仲裁管理</title>
+    <meta name="decorator" content="default"/>
+    <%@include file="/WEB-INF/views/include/head.jsp" %>
+    <style type="text/css">.sort {
+        color: #0663A2;
+        cursor: pointer;
+    }</style>
 </head>
 <body>
-    <ul class="nav nav-tabs">
+<ul class="nav nav-tabs">
     <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-mark')}">
-    	<li><a href="${ctx}/admin/exam/mark?subjectCode=${subject.code}">评卷进度</a></li>
-    	</c:if>
-    	<c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-group')}">
+        <li><a href="${ctx}/admin/exam/mark?subjectCode=${subject.code}">评卷进度</a></li>
+    </c:if>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-group')}">
         <li><a href="${ctx}/admin/exam/group?subjectCode=${query.subjectCode}">分组管理</a></li>
-        </c:if>
-        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-marker')}">
+    </c:if>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-marker')}">
         <li><a href="${ctx}/admin/exam/marker?subjectCode=${query.subjectCode}">评卷员管理</a></li>
-        </c:if>
-        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-trial')}">
+    </c:if>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-trial')}">
         <li><a href="${ctx}/admin/exam/trial?subjectCode=${query.subjectCode}">试评管理</a></li>
-        </c:if>
-        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-library')}">
+    </c:if>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-library')}">
         <li><a href="${ctx}/admin/exam/library?subjectCode=${query.subjectCode}">任务管理</a></li>
-        </c:if>
-        <li class="active"><a href="##">仲裁管理</a></li>
-        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-quality')}">
+    </c:if>
+    <li class="active"><a href="##">仲裁管理</a></li>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-quality')}">
         <li><a href="${ctx}/admin/exam/quality?subjectCode=${query.subjectCode}">质量监控</a></li>
-        </c:if>
-    </ul>
-	<form id="searchForm" action="${ctx}/admin/exam/arbitrate" method="post" class="breadcrumb form-search">
-	    <input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
-	    <input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize }"/>
-	    <div>
-			<label>科目</label>
-			<select class="input-large" id="subject-select" name="subjectCode">
-				<c:forEach items="${subjectList}" var="item">
-				<option value="${item.code}" <c:if test="${item.code==query.subjectCode}">selected</c:if>>${item.code}-${item.name}</option>
-				</c:forEach>
-			</select>
-			<label>分组</label>
-            <select class="input-medium" id="group-select" name="groupNumber">
-            	<option  value="" <c:if test="${query.groupNumber==null}">selected</c:if>>不限</option>
-                <c:forEach items="${groupList}" var="item">
-                <option value="${item.number}" <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
-                </c:forEach>
-            </select>
-            <label>状态</label>
-            <select class="input-small" id="status-select" name="status">
-                <option value="">不限</option>
-                <c:forEach items="${statusList}" var="item">
-	            <option value="${item.value}" <c:if test="${query.status!=null && item.value==query.status.value}">selected</c:if>>${item.name}</option>
-                </c:forEach>
-            </select>
-            <label>选做题</label>
-            <select class="input-small"  name="unselective">
-                <option value="false"<c:if test="${!query.unselective}">selected</c:if>>不限</option>
-	            <option value="true" <c:if test="${query.unselective}">selected</c:if>>未选做</option>
-            </select>
-            <c:if test="${web_user.schoolAdmin==true || forbiddenScore==false}">
+    </c:if>
+</ul>
+<form id="searchForm" action="${ctx}/admin/exam/arbitrate" method="post" class="breadcrumb form-search">
+    <input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
+    <input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize }"/>
+    <div>
+        <label>科目</label>
+        <select class="input-large" id="subject-select" name="subjectCode">
+            <c:forEach items="${subjectList}" var="item">
+                <option value="${item.code}"
+                        <c:if test="${item.code==query.subjectCode}">selected</c:if>>${item.code}-${item.name}</option>
+            </c:forEach>
+        </select>
+        <label>分组</label>
+        <select class="input-medium" id="group-select" name="groupNumber">
+            <option value="" <c:if test="${query.groupNumber==null}">selected</c:if>>不限</option>
+            <c:forEach items="${groupList}" var="item">
+                <option value="${item.number}"
+                        <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
+            </c:forEach>
+        </select>
+        <label>状态</label>
+        <select class="input-small" id="status-select" name="status">
+            <option value="">不限</option>
+            <c:forEach items="${statusList}" var="item">
+                <option value="${item.value}"
+                        <c:if test="${query.status!=null && item.value==query.status.value}">selected</c:if>>${item.name}</option>
+            </c:forEach>
+        </select>
+        <label>选做题</label>
+        <select class="input-small" name="unselective">
+            <option value="false" <c:if test="${!query.unselective}">selected</c:if>>不限</option>
+            <option value="true" <c:if test="${query.unselective}">selected</c:if>>未选做</option>
+        </select>
+        <c:if test="${web_user.schoolAdmin==true || forbiddenScore==false}">
             <label>准考证号</label>
-            <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"/>
-			&nbsp;
-			</c:if>
-			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
-			
-			<c:if test="${query.totalCount>0}">
-			&nbsp;
+            <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"
+                    <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}"> disabled="disabled"</c:if>/>
+            />
+            &nbsp;
+        </c:if>
+        <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
+
+        <c:if test="${query.totalCount>0}">
+            &nbsp;
             <a href="##" class="btn" id="batch-process-link" target="_blank">批量处理</a>
-            </c:if>
-		</div>
-	</form>
-	<tags:message content="${message}"/>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>科目代码</th>
-				<th>分组序号</th>
-				<th>准考证号</th>
-				<th>状态</th>
-				<th>创建时间</th>
-				<th>处理时间</th>
-				<th>处理人</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${query.result}" var="result">
-			<tr>
-				<td>${result.subjectCode}</td>
-				<td>${result.groupNumber}</td>
-				<td>
-					<c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
-		            ***
-		            </c:if>
-		            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
-		            ${result.examNumber}
-		            </c:if>
-				</td>
-				<td>${result.status.name}</td>
-				<td>
-                    <fmt:formatDate value="${result.createTime}" pattern="yyyy-MM-dd HH:mm:ss" />
-                </td>
-				<td>
-				    <c:if test="${result.updateTime!=null}">
-                    <fmt:formatDate value="${result.updateTime}" pattern="yyyy-MM-dd HH:mm:ss" />
-                    </c:if>
-                    <c:if test="${result.updateTime==null}">
+        </c:if>
+    </div>
+</form>
+<tags:message content="${message}"/>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>科目代码</th>
+        <th>分组序号</th>
+        <th>准考证号</th>
+        <th>状态</th>
+        <th>创建时间</th>
+        <th>处理时间</th>
+        <th>处理人</th>
+        <th>操作</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${query.result}" var="result">
+        <tr>
+            <td>${result.subjectCode}</td>
+            <td>${result.groupNumber}</td>
+            <td>
+                <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
+                    ***
+                </c:if>
+                <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+                    ${result.examNumber}
+                </c:if>
+            </td>
+            <td>${result.status.name}</td>
+            <td>
+                <fmt:formatDate value="${result.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+            </td>
+            <td>
+                <c:if test="${result.updateTime!=null}">
+                    <fmt:formatDate value="${result.updateTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                </c:if>
+                <c:if test="${result.updateTime==null}">
                     &nbsp;
-                    </c:if>
-				</td>
-				<td>
-                    <c:if test="${result.user!=null}">
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${result.user!=null}">
                     <a href="##" data-toggle="tooltip" title="${result.user.name}">${result.user.loginName}</a>
-                    </c:if>
-                    <c:if test="${result.user==null}">
+                </c:if>
+                <c:if test="${result.user==null}">
                     &nbsp;
-                    </c:if>
-                </td>
-				<td>
-				    <c:if test="${(result.status.value==0 || result.status.value==1) && (result.totalScore!= -1)}">
-                    <a href="${ctx}/web/admin/exam/arbitrate/start?historyId=${result.id}" target="_blank" class="process-link">处理</a>
-					</c:if>
-				</td>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	<div class="pagination">${query}</div>
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${(result.status.value==0 || result.status.value==1) && (result.totalScore!= -1)}">
+                    <a href="${ctx}/web/admin/exam/arbitrate/start?historyId=${result.id}" target="_blank"
+                       class="process-link">处理</a>
+                </c:if>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
+<div class="pagination">${query}</div>
 <script type="text/javascript">
-$('.back-link').click(function(){
-	if(!confirm('确定要打回该仲裁记录的所有评卷任务吗?')){
-	    return;
-	}
-	$.post('${ctx}/admin/exam/arbitrate/back', {id: $(this).attr('data-id')}, function(result){
-	    if(result.success==true){
-            alert('打回成功');
-            $("#searchForm").submit();
-        }else{
-            alert(result.message);
+    $('.back-link').click(function () {
+        if (!confirm('确定要打回该仲裁记录的所有评卷任务吗?')) {
+            return;
+        }
+        $.post('${ctx}/admin/exam/arbitrate/back', {id: $(this).attr('data-id')}, function (result) {
+            if (result.success == true) {
+                alert('打回成功');
+                $("#searchForm").submit();
+            } else {
+                alert(result.message);
+            }
+        });
+    });
+    $('#batch-process-link').click(function () {
+        var subjectCode = $('#subject-select').val();
+        var groupNumber = $('#group-select').val();
+        if (subjectCode == undefined || subjectCode == '') {
+            alert('请选择科目')
+            return false;
+        }
+        if (groupNumber == undefined || groupNumber == '') {
+            alert('请选择分组')
+            return false;
+        }
+        $('#batch-process-link').attr('href', '${ctx}/web/admin/exam/arbitrate/start?subjectCode=' + subjectCode + '&groupNumber=' + groupNumber);
+        return true;
+    });
+    $('#subject-select').change(function () {
+        var code = $(this).val();
+        $('#group-select').empty();
+        if (code == '') {
+            $('#group-select').val('').trigger('change');
+            return;
         }
-	});
-});
-$('#batch-process-link').click(function(){
-    var subjectCode = $('#subject-select').val();
-    var groupNumber = $('#group-select').val();
-    if(subjectCode==undefined || subjectCode=='') {
-        alert('请选择科目')
+        $.post('${ctx}/admin/exam/group/query', {subjectCode: code, withDouble: true}, function (result) {
+            var parent = $('#group-select');
+            var first = '';
+            $('<option value="">不限</option>').appendTo(parent);
+            for (var i = 0; i < result.length; i++) {
+                var group = result[i];
+                $('<option value="' + group.number + '">' + group.number + '-' + group.title + '</option>').appendTo(parent);
+                /*  if(i==0){
+                     first = group.number;
+                 } */
+            }
+            parent.val(first).trigger('change');
+        });
+    });
+
+    function page(n, s) {
+        $("#pageNumber").val(n);
+        $("#pageSize").val(s);
+        $("#searchForm").submit();
         return false;
     }
-    if(groupNumber==undefined || groupNumber=='') {
-        alert('请选择分组')
+
+    function goSearch() {
+        $("#pageNumber").val(1);
+        $("#searchForm").submit();
         return false;
     }
-    $('#batch-process-link').attr('href', '${ctx}/web/admin/exam/arbitrate/start?subjectCode='+subjectCode+'&groupNumber='+groupNumber);
-    return true;
-});
-$('#subject-select').change(function(){
-    var code = $(this).val();
-    $('#group-select').empty();
-    if(code==''){
-        $('#group-select').val('').trigger('change');
-        return;
-    }
-    $.post('${ctx}/admin/exam/group/query', {subjectCode: code, withDouble: true}, function(result){
-        var parent = $('#group-select');
-        var first = '';
-        $('<option value="">不限</option>').appendTo(parent);
-        for(var i=0;i<result.length;i++){
-            var group = result[i];
-            $('<option value="'+group.number+'">'+group.number+'-'+group.title+'</option>').appendTo(parent);
-           /*  if(i==0){
-                first = group.number;
-            } */
-        }
-        parent.val(first).trigger('change');
-    });
-});
-function page(n,s){
-    $("#pageNumber").val(n);
-    $("#pageSize").val(s);
-    $("#searchForm").submit();
-    return false;
-}
-function goSearch(){
-    $("#pageNumber").val(1);
-    $("#searchForm").submit();
-    return false;
-}
-</script>	
+</script>
 </body>
 </html>

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

@@ -13,99 +13,102 @@
         color: #0663A2;
         cursor: pointer;
     }
-         .rejectWindow {
-            width: 500px;
-            min-height: 200px;
-            background: #fff;
-          
-            padding-bottom:30px;
-            font-family: "微软雅黑", Fixedsys;
-            border: #5d6d7d solid 1px;
-            position: absolute;
-            left: 50%;
-            top: 50%;
-            margin: -150px 0 0 -200px;
-            text-align: center;
-            z-index: 9999;
-        }
-        .rejectWindow .form-horizontal .control-label{
-        	width:100px;
-        }
-		.rejectWindow .form-horizontal .controls{
-        	margin-left:120px;
-        }
-        
-        .task-header, .password-header {
-            width: 100%;
-            height: 46px;
-            background: #5d6d7d;
-            color: #fff;
-            margin-bottom:30px;
-        }
-        
-        .task-content, .password-content {
-            font-size: 18px;
-            color: #005277;
-            text-align: left;
-            padding: 15px;
-            line-height: 30px;
-            word-wrap: break-word;
-        }
-        
-        .image-close {
-            margin-top: 15px;
-            margin-right: 15px;
-            cursor: pointer;
-            float: right;
-        }
-        
-        .title {
-            font-size: 22px;
-            font-weight: bold;
-            color: #fff;
-            margin: 0px;
-            padding: 13px 0 0 13px;
-            float: left;
-        }
 
-        .task-count, .password-value {
-            width: 50px;
-        }
+    .rejectWindow {
+        width: 500px;
+        min-height: 200px;
+        background: #fff;
 
-        .btn-info {
-            height: 25px;
-            margin-left: 320px;
-            margin-bottom: 20px;
-        }
-        
-        .wrong, .passwordWrong {
-            font-size: 12px;
-            color: #f00;
-            line-height: 30px;
-            padding-left: 20px;
-        } 
+        padding-bottom: 30px;
+        font-family: "微软雅黑", Fixedsys;
+        border: #5d6d7d solid 1px;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        margin: -150px 0 0 -200px;
+        text-align: center;
+        z-index: 9999;
+    }
+
+    .rejectWindow .form-horizontal .control-label {
+        width: 100px;
+    }
+
+    .rejectWindow .form-horizontal .controls {
+        margin-left: 120px;
+    }
+
+    .task-header, .password-header {
+        width: 100%;
+        height: 46px;
+        background: #5d6d7d;
+        color: #fff;
+        margin-bottom: 30px;
+    }
+
+    .task-content, .password-content {
+        font-size: 18px;
+        color: #005277;
+        text-align: left;
+        padding: 15px;
+        line-height: 30px;
+        word-wrap: break-word;
+    }
+
+    .image-close {
+        margin-top: 15px;
+        margin-right: 15px;
+        cursor: pointer;
+        float: right;
+    }
+
+    .title {
+        font-size: 22px;
+        font-weight: bold;
+        color: #fff;
+        margin: 0px;
+        padding: 13px 0 0 13px;
+        float: left;
+    }
+
+    .task-count, .password-value {
+        width: 50px;
+    }
+
+    .btn-info {
+        height: 25px;
+        margin-left: 320px;
+        margin-bottom: 20px;
+    }
+
+    .wrong, .passwordWrong {
+        font-size: 12px;
+        color: #f00;
+        line-height: 30px;
+        padding-left: 20px;
+    }
     </style>
 </head>
 <body>
 <ul class="nav nav-tabs">
-<c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-mark')}">
-	<li><a href="${ctx}/admin/exam/mark?subjectCode=${query.subjectCode}">评卷进度</a></li>
-	</c:if>
-	<c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-group')}">
-    <li><a href="${ctx}/admin/exam/group?subjectCode=${query.subjectCode}">分组管理</a></li>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-mark')}">
+        <li><a href="${ctx}/admin/exam/mark?subjectCode=${query.subjectCode}">评卷进度</a></li>
+    </c:if>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-group')}">
+        <li><a href="${ctx}/admin/exam/group?subjectCode=${query.subjectCode}">分组管理</a></li>
     </c:if>
     <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-marker')}">
-    <li><a href="${ctx}/admin/exam/marker?subjectCode=${query.subjectCode}">评卷员管理</a></li>
+        <li><a href="${ctx}/admin/exam/marker?subjectCode=${query.subjectCode}">评卷员管理</a></li>
     </c:if>
-        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-trial')}">
-    <li><a href="${ctx}/admin/exam/trial?subjectCode=${query.subjectCode}">试评管理</a></li>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-trial')}">
+        <li><a href="${ctx}/admin/exam/trial?subjectCode=${query.subjectCode}">试评管理</a></li>
     </c:if>
     <li class="active"><a href="##">任务管理</a></li>
     <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-arbitrate')}">
-    <li><a href="${ctx}/admin/exam/arbitrate?subjectCode=${query.subjectCode}">仲裁管理</a></li>
+        <li><a href="${ctx}/admin/exam/arbitrate?subjectCode=${query.subjectCode}">仲裁管理</a></li>
     </c:if>
-        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-quality')}">
-    <li><a href="${ctx}/admin/exam/quality?subjectCode=${query.subjectCode}">质量监控</a></li>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-quality')}">
+        <li><a href="${ctx}/admin/exam/quality?subjectCode=${query.subjectCode}">质量监控</a></li>
     </c:if>
 </ul>
 <form id="searchForm" action="${ctx}/admin/exam/library" method="post" class="breadcrumb form-search">
@@ -115,21 +118,24 @@
         <label>科目</label>
         <select class="input-large" id="subject-select" name="subjectCode">
             <c:forEach items="${subjectList}" var="item">
-                <option value="${item.code}" <c:if test="${item.code==query.subjectCode}">selected</c:if>>${item.code}-${item.name}</option>
+                <option value="${item.code}"
+                        <c:if test="${item.code==query.subjectCode}">selected</c:if>>${item.code}-${item.name}</option>
             </c:forEach>
         </select>
         <label>分组</label>
         <select class="input-medium" id="group-select" name="groupNumber">
-        	<option value="" <c:if test="${query.groupNumber==null}">selected</c:if>>不限</option>
+            <option value="" <c:if test="${query.groupNumber==null}">selected</c:if>>不限</option>
             <c:forEach items="${groupList}" var="item">
-                <option value="${item.number}" <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
+                <option value="${item.number}"
+                        <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
             </c:forEach>
         </select>
         <label>状态</label>
         <select class="input-small" id="status-select" name="status">
             <option value="">不限</option>
             <c:forEach items="${statusList}" var="item">
-                <option value="${item.value}" <c:if test="${item.value==status.value}">selected</c:if>>${item.name}</option>
+                <option value="${item.value}"
+                        <c:if test="${item.value==status.value}">selected</c:if>>${item.name}</option>
             </c:forEach>
         </select>
         <span id="reasonSpan" <c:if test="${status.value!=2}">class="hide"</c:if>>
@@ -146,20 +152,23 @@
         <select class="input-medium" id="marker-select" name="markerId">
             <option value="0">不限</option>
             <c:forEach items="${markerList}" var="item">
-                <option value="${item.id}" <c:if test="${item.id==query.markerId}">selected</c:if>>${item.loginName}</option>
+                <option value="${item.id}"
+                        <c:if test="${item.id==query.markerId}">selected</c:if>>${item.loginName}</option>
             </c:forEach>
         </select>
         <br/><br/>
         <label>选做题</label>
-        <select class="input-small"  name="unselective">
-            <option value="false"<c:if test="${!query.unselective}">selected</c:if>>不限</option>
-	        <option value="true" <c:if test="${query.unselective}">selected</c:if>>未选做</option>
+        <select class="input-small" name="unselective">
+            <option value="false" <c:if test="${!query.unselective}">selected</c:if>>不限</option>
+            <option value="true" <c:if test="${query.unselective}">selected</c:if>>未选做</option>
         </select>
-        
+
         <c:if test="${web_user.schoolAdmin==true || forbiddenScore==false}">
-        <label>准考证号</label>
-        <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"/>
-        &nbsp;
+            <label>准考证号</label>
+            <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"
+                    <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}"> disabled="disabled"</c:if>/>
+            />
+            &nbsp;
         </c:if>
         <label>密号</label>
         <input type="text" name="secretNumber" id="secretNumber" value="${query.secretNumber}" class="input-medium"/>
@@ -170,13 +179,15 @@
         <input type="number" id="endScore" name="endScore" value="${query.endScore}" class="input-mini"/>
         <br/><br/>
         <label>小题得分</label>
-        <input type="text" number="true" name="questionScore" id="questionScore" value="${query.questionScore }" class="input-mini"/>
+        <input type="text" number="true" name="questionScore" id="questionScore" value="${query.questionScore }"
+               class="input-mini"/>
         &nbsp;
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
         &nbsp;
         <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-library-inspect') && examType!='MULTI_MEDIA' && inspectedCount!=null && inspectedCount>0}">
-            <a id="btnInspected" target="_blank" href="${ctx}/web/admin/exam/library/inspected/start?subjectCode=${query.subjectCode}&groupNumber=${query.groupNumber}&markerId=${query.markerId}&examNumber=${query.examNumber}&secretNumber=${query.secretNumber}&startScore=${query.startScore}&endScore=${query.endScore}&questionScore=${query.questionScore}&unselective=${query.unselective}"
-             class="btn">待复核：${inspectedCount }</a>
+            <a id="btnInspected" target="_blank"
+               href="${ctx}/web/admin/exam/library/inspected/start?subjectCode=${query.subjectCode}&groupNumber=${query.groupNumber}&markerId=${query.markerId}&examNumber=${query.examNumber}&secretNumber=${query.secretNumber}&startScore=${query.startScore}&endScore=${query.endScore}&questionScore=${query.questionScore}&unselective=${query.unselective}"
+               class="btn">待复核：${inspectedCount }</a>
         </c:if>
     </div>
 </form>
@@ -205,12 +216,12 @@
             <td>${result.subjectCode}</td>
             <td>${result.groupNumber}</td>
             <td>
-            	<c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
-	            ***
-	            </c:if>
-	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
-	            ${result.examNumber}
-	            </c:if>
+                <c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
+                    ***
+                </c:if>
+                <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+                    ${result.examNumber}
+                </c:if>
             </td>
             <td>${result.secretNumber}</td>
             <td>${result.status.name}</td>
@@ -222,8 +233,9 @@
             <td>${result.markerLoginName}</td>
             <td>
                 <c:if test="${result.markerScore!=null}">
-                	<c:if test="${result.markerScore==-1}">未选做</c:if>
-                    <c:if test="${result.markerScore!=-1}"><fmt:formatNumber pattern="###.###" value="${result.markerScore}"/></c:if>
+                    <c:if test="${result.markerScore==-1}">未选做</c:if>
+                    <c:if test="${result.markerScore!=-1}"><fmt:formatNumber pattern="###.###"
+                                                                             value="${result.markerScore}"/></c:if>
                 </c:if>
                 <c:if test="${result.markerScore==null}">
                     &nbsp;
@@ -246,19 +258,20 @@
                 </c:if>
             </td>
             <td> ${result.headerLoginName} </td>
-			<td>
-				<c:if test="${result.headerLoginName!=null && result.headerTime!=null}">
-					<fmt:formatDate value="${result.headerTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
-				</c:if>
-			</td>
+            <td>
+                <c:if test="${result.headerLoginName!=null && result.headerTime!=null}">
+                    <fmt:formatDate value="${result.headerTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                </c:if>
+            </td>
             <td>
                 <c:if test="${result.status.value==1 || result.status.value==3 ||result.status.value==5 ||result.status.value==6}">
-                   <%--  <c:if test="${examType=='MULTI_MEDIA'}">
-                        <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${result.studentId}&groupNumber=${result.groupNumber}" target="_blank">原图</a>
-                    </c:if>
-                    <c:if test="${examType!='MULTI_MEDIA'}"> --%>
-                      	<a href="${ctx}/web/admin/exam/track/library?libraryId=${result.id}&subjectCode=${result.subjectCode}" target="_blank">查看</a>
-                   <%--  </c:if> --%>
+                    <%--  <c:if test="${examType=='MULTI_MEDIA'}">
+                         <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${result.studentId}&groupNumber=${result.groupNumber}" target="_blank">原图</a>
+                     </c:if>
+                     <c:if test="${examType!='MULTI_MEDIA'}"> --%>
+                    <a href="${ctx}/web/admin/exam/track/library?libraryId=${result.id}&subjectCode=${result.subjectCode}"
+                       target="_blank">查看</a>
+                    <%--  </c:if> --%>
                 </c:if>
                 <c:if test="${result.status.value==1 || result.status.value==5 ||result.status.value==6}">
                     &nbsp;
@@ -269,38 +282,39 @@
     </c:forEach>
     </tbody>
 </table>
-	<div class="rejectWindow" style="display:none">
-	    <div class="task-header">
-	        <p class="title">打回</p>
-	        <p class="image-close"><img src="${ctxStatic}/mark-new/images/images-close.png"/></p></div>
-	        <input id="rejectId" type="hidden"/>
-	    <form class="form-horizontal">
-            <div class="control-group">
-                <label class="control-label"><span style="color:red;font-size:16px;margin-right:3px">*</span>打回原因</label>
-                <div class="controls">
-                    <select id="rejectReasonSelect" name="rejectReasonSelect">
-                        <option value = '给分较高'>给分较高</option>
-                        <option value = '给分较低'>给分较低</option>
-                        <option value = '判分错误'>判分错误</option>
-                        <option value = '其它'>其它</option>
-                    </select>
-                </div>
+<div class="rejectWindow" style="display:none">
+    <div class="task-header">
+        <p class="title">打回</p>
+        <p class="image-close"><img src="${ctxStatic}/mark-new/images/images-close.png"/></p></div>
+    <input id="rejectId" type="hidden"/>
+    <form class="form-horizontal">
+        <div class="control-group">
+            <label class="control-label"><span
+                    style="color:red;font-size:16px;margin-right:3px">*</span>打回原因</label>
+            <div class="controls">
+                <select id="rejectReasonSelect" name="rejectReasonSelect">
+                    <option value='给分较高'>给分较高</option>
+                    <option value='给分较低'>给分较低</option>
+                    <option value='判分错误'>判分错误</option>
+                    <option value='其它'>其它</option>
+                </select>
             </div>
-            <div class="control-group">
-                <label class="control-label">详情描述</label>
-                <div class="controls">
-                    <textarea rows="3" id="rejectReasonInput" maxlength="60"></textarea>
-                </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label">详情描述</label>
+            <div class="controls">
+                <textarea rows="3" id="rejectReasonInput" maxlength="60"></textarea>
             </div>
-            <div style="text-align:center;">
+        </div>
+        <div style="text-align:center;">
             <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-library-reject')}">
                 <a class="btn btn-primary task-btn">打回</a>
-                </c:if>
-                &nbsp;
-                <a class="btn task-cancel">取消</a>
-            </div>
-        </form>
-	</div>
+            </c:if>
+            &nbsp;
+            <a class="btn task-cancel">取消</a>
+        </div>
+    </form>
+</div>
 <div class="pagination">${query}</div>
 <%@include file="/WEB-INF/views/include/trackView.jsp" %>
 <script type="text/javascript">
@@ -337,7 +351,10 @@
         if (groupNumber == '') {
             return;
         }
-        $.post('${ctx}/admin/exam/marker/query', {subjectCode: subjectCode, groupNumber: groupNumber}, function (result) {
+        $.post('${ctx}/admin/exam/marker/query', {
+            subjectCode: subjectCode,
+            groupNumber: groupNumber
+        }, function (result) {
             var parent = $('#marker-select');
             var first = '';
             for (var i = 0; i < result.length; i++) {
@@ -352,13 +369,14 @@
     });
 
     $('#status-select').change(function () {
-    	var status = $(this).val();
-    	if(status==2){
-    		 $('#reasonSpan').show();
-    	}else{
-    		 $('#reasonSpan').hide();
-    	}
+        var status = $(this).val();
+        if (status == 2) {
+            $('#reasonSpan').show();
+        } else {
+            $('#reasonSpan').hide();
+        }
     });
+
     function page(n, s) {
         $("#pageNumber").val(n);
         $("#pageSize").val(s);
@@ -391,17 +409,18 @@
         $("#searchForm").submit();
         return false;
     }
+
     $('#btnInspected').click(function () {
-    	var groupNumber='${query.groupNumber}';
-    	if(groupNumber==null||groupNumber==''){
-    		alert("请选择分组查询后再开始复核");
-    		return false;
-    	}
+        var groupNumber = '${query.groupNumber}';
+        if (groupNumber == null || groupNumber == '') {
+            alert("请选择分组查询后再开始复核");
+            return false;
+        }
     });
     $('.back-link').click(function () {
-    	$('#rejectReasonInput').attr("value","");
-    	$('#rejectId').attr("value", $(this).attr('data-id'));
-    	$('.rejectWindow').show();
+        $('#rejectReasonInput').attr("value", "");
+        $('#rejectId').attr("value", $(this).attr('data-id'));
+        $('.rejectWindow').show();
     });
     $('.image-close').click(function () {
         $('.rejectWindow').hide();
@@ -410,30 +429,30 @@
         $('.rejectWindow').hide();
     });
     $('.task-btn').click(function () {
-        var rejectReason =$("#rejectReasonSelect").val();
+        var rejectReason = $("#rejectReasonSelect").val();
         var rejectReasonInput = $('#rejectReasonInput').val();
-        var rejectId=$("#rejectId").val();
-        if(rejectReason==""||rejectReason==undefined){
-        	alert("请选择打回原因");
-        	return false;
+        var rejectId = $("#rejectId").val();
+        if (rejectReason == "" || rejectReason == undefined) {
+            alert("请选择打回原因");
+            return false;
         }
-        if(rejectReasonInput!="" &&rejectReasonInput!=null){
-        	rejectReason =rejectReason+":"+rejectReasonInput;
+        if (rejectReasonInput != "" && rejectReasonInput != null) {
+            rejectReason = rejectReason + ":" + rejectReasonInput;
         }
         $.ajax({
-        	url:"${ctx}/admin/exam/library/reject",
-        	data:{id: rejectId, reason: rejectReason},
-        	traditional:true,
-        	type:"post",
-        	success:function (result) {
+            url: "${ctx}/admin/exam/library/reject",
+            data: {id: rejectId, reason: rejectReason},
+            traditional: true,
+            type: "post",
+            success: function (result) {
                 if (result.success == true) {
-                	 alert('打回成功');
+                    alert('打回成功');
                     $("#searchForm").submit();
                 } else {
                     alert(result.message);
                 }
                 $('.rejectWindow').hide();
-        	}
+            }
         });
     });
 </script>

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

@@ -16,16 +16,23 @@
     <input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize }"/>
     <div>
         <label>姓名</label>
-        <input type="text" name="name" value="${query.name}" maxlength="10" class="input-mini"/>
+        <input type="text" name="name" value="${query.name}" maxlength="10" class="input-mini"
+                <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}"> disabled="disabled"</c:if>/>
+        />
         <label>准考证号</label>
-        <input type="text" name="examNumber" value="${query.examNumber}" maxlength="50" class="input-small"/>
+        <input type="text" name="examNumber" value="${query.examNumber}" maxlength="50" class="input-small"
+                <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}"> disabled="disabled"</c:if>/>
+        />
         <label>学号</label>
-        <input type="text" name="studentCode" value="${query.studentCode}" maxlength="30" class="input-small"/>
+        <input type="text" name="studentCode" value="${query.studentCode}" maxlength="30" class="input-small"
+                <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}"> disabled="disabled"</c:if>/>
+        />
         <label>科目</label>
         <select class="input-large" name="subjectCode" id="subject-select">
             <option value="">请选择</option>
             <c:forEach items="${subjectList}" var="subject">
-                <option value="${subject.code}" <c:if test="${subject.code==query.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
+                <option value="${subject.code}"
+                        <c:if test="${subject.code==query.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
             </c:forEach>
         </select>
         <label>筛选</label>
@@ -55,10 +62,11 @@
         <br/><br/>
         <!--     总分 > startScore and 总分 <=endScore             -->
         <label>总分：从</label>
-        <input type="text" number="true" id="startScore" name="startScore" value="${query.startScore}" class="input-mini"/>
+        <input type="text" number="true" id="startScore" name="startScore" value="${query.startScore}"
+               class="input-mini"/>
         <label> 到&nbsp;&nbsp;&nbsp;</label>
         <input type="text" number="true" id="endScore" name="endScore" value="${query.endScore}" class="input-mini"/>
-        
+
         <label>电厂</label>
         <input type="text" name="college" value="${query.college}" maxlength="64" class="input-mini"/>
         <label>机组</label>
@@ -73,29 +81,29 @@
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
         &nbsp;
         <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_score-export')}">
-           <%--  <input id="export-button" class="btn" type="button" value="导出" onclick="goExport()"
-                   <c:if test="${!enableExport}">disabled</c:if> title="${exportMessage}"/> --%>
+            <%--  <input id="export-button" class="btn" type="button" value="导出" onclick="goExport()"
+                    <c:if test="${!enableExport}">disabled</c:if> title="${exportMessage}"/> --%>
             <input id="export-button-2" class="btn" type="button" value="导出" onclick="goExport2()"
-                   <c:if test="${!enableExport}">disabled</c:if> title="${exportMessage}"/>       
+                   <c:if test="${!enableExport}">disabled</c:if> title="${exportMessage}"/>
         </c:if>
     </div>
 </form>
 <form id="exportForm" action="${ctx}/admin/exam/score/export" method="post" class="breadcrumb form-search hide">
-		<input type="text" name="name" value="${query.name}" maxlength="10" class="input-mini"/>
-        <input type="text" name="examNumber" value="${query.examNumber}" maxlength="50" class="input-small"/>
-        <input type="text" name="studentCode" value="${query.studentCode}" maxlength="30" class="input-small"/>
-        <input type="text" name="subjectCode" value="${query.subjectCode}"  class="input-small"/>
-   		<input type="text" name="upload" value="${query.upload}" class="input-small"/>
-		<input type="text" name="absent" value="${query.absent}" class="input-small"/>
-		<input type="text" name="breach" value="${query.breach}" class="input-small"/>
-		<input type="text" name="filter" value="${filter}" class="input-small"/>
-		<input type="text" name="startScore" value="${query.startScore}" class="input-small"/>
-		<input type="text" name="endScore" value="${query.endScore}" class="input-small"/>
-		<input type="text" name="college" value="${query.college}" class="input-small"/>
-		<input type="text" name="className" value="${query.className}" class="input-small"/>
-		<input type="text" name="teacher" value="${query.teacher}" class="input-small"/>
-        <input type="text" name="examSite" value="${query.examSite}" maxlength="64" class="input-mini"/>
-        <input type="text" name="examRoom" value="${query.examRoom}" maxlength="64" class="input-mini"/>
+    <input type="text" name="name" value="${query.name}" maxlength="10" class="input-mini"/>
+    <input type="text" name="examNumber" value="${query.examNumber}" maxlength="50" class="input-small"/>
+    <input type="text" name="studentCode" value="${query.studentCode}" maxlength="30" class="input-small"/>
+    <input type="text" name="subjectCode" value="${query.subjectCode}" class="input-small"/>
+    <input type="text" name="upload" value="${query.upload}" class="input-small"/>
+    <input type="text" name="absent" value="${query.absent}" class="input-small"/>
+    <input type="text" name="breach" value="${query.breach}" class="input-small"/>
+    <input type="text" name="filter" value="${filter}" class="input-small"/>
+    <input type="text" name="startScore" value="${query.startScore}" class="input-small"/>
+    <input type="text" name="endScore" value="${query.endScore}" class="input-small"/>
+    <input type="text" name="college" value="${query.college}" class="input-small"/>
+    <input type="text" name="className" value="${query.className}" class="input-small"/>
+    <input type="text" name="teacher" value="${query.teacher}" class="input-small"/>
+    <input type="text" name="examSite" value="${query.examSite}" maxlength="64" class="input-mini"/>
+    <input type="text" name="examRoom" value="${query.examRoom}" maxlength="64" class="input-mini"/>
 </form>
 <tags:message content="${message}"/>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
@@ -125,29 +133,29 @@
     <c:forEach items="${query.result}" var="student">
         <tr>
             <td>
-                <%--    <a href="##" class="detail-link" data-exam-number="${student.examNumber}">${student.examNumber}</a>  --%>
-	            <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
-	            ***
-	            </c:if>
-	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
-	            ${student.examNumber}
-	            </c:if>
+                    <%--    <a href="##" class="detail-link" data-exam-number="${student.examNumber}">${student.examNumber}</a>  --%>
+                <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
+                    ***
+                </c:if>
+                <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+                    ${student.examNumber}
+                </c:if>
             </td>
             <td>
-	            <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
-	            ***
-	            </c:if>
-	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
-	            ${student.name}
-	            </c:if>
+                <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
+                    ***
+                </c:if>
+                <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+                    ${student.name}
+                </c:if>
             </td>
             <td>
-            	<c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
-	            ***
-	            </c:if>
-	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
-	            ${student.studentCode}
-	            </c:if>
+                <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
+                    ***
+                </c:if>
+                <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+                    ${student.studentCode}
+                </c:if>
             </td>
             <td>${student.subjectCode}-${student.subjectName}&nbsp;${student.subjectRemark}</td>
             <td>${student.subjectLevel}</td>
@@ -220,20 +228,24 @@
             <td>
                 <c:if test="${student.upload==true}">
                     <c:if test="${examType!='MULTI_MEDIA'}">
-                    	<c:if test='${web_user.schoolAdmin==true}'>
-                        <a class="sheet-link" href="##" data-id="${student.id}" data-sheet-url="${student.sheetUrlString}"
-                           data-answer-url="<c:if test="${student.answerUrl!=null}">${fileServer}${student.answerUrl}</c:if>"
-                           data-title="${student.examNumber}&nbsp;&nbsp;${student.name}&nbsp;&nbsp;客观总分${student.objectiveScoreString}&nbsp;&nbsp;主观总分${student.subjectiveScoreString}&nbsp;&nbsp;全卷总分${student.totalScoreString}">原图</a>
+                        <c:if test='${web_user.schoolAdmin==true}'>
+                            <a class="sheet-link" href="##" data-id="${student.id}"
+                               data-sheet-url="${student.sheetUrlString}"
+                               data-answer-url="<c:if test="${student.answerUrl!=null}">${fileServer}${student.answerUrl}</c:if>"
+                               data-title="${student.examNumber}&nbsp;&nbsp;${student.name}&nbsp;&nbsp;客观总分${student.objectiveScoreString}&nbsp;&nbsp;主观总分${student.subjectiveScoreString}&nbsp;&nbsp;全卷总分${student.totalScoreString}">原图</a>
                         </c:if>
-                        <a href="${ctx}/web/admin/exam/track/student?studentId=${student.id}&subjectCode=${student.subjectCode}" target="_blank">轨迹图</a>
+                        <a href="${ctx}/web/admin/exam/track/student?studentId=${student.id}&subjectCode=${student.subjectCode}"
+                           target="_blank">轨迹图</a>
                     </c:if>
                     <c:if test="${examType=='MULTI_MEDIA'}">
-                       <%--  <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${student.id}" target="_blank">原图</a> --%>
-                        <a href="${ctx}/web/admin/exam/track/student?studentId=${student.id}&subjectCode=${student.subjectCode}" target="_blank">原卷</a>
+                        <%--  <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${student.id}" target="_blank">原图</a> --%>
+                        <a href="${ctx}/web/admin/exam/track/student?studentId=${student.id}&subjectCode=${student.subjectCode}"
+                           target="_blank">原卷</a>
                     </c:if>
                 </c:if>
                 <c:if test="${student.packageUrlString!=null && student.packageUrlString!=''}">
-                    <a class="package-link" href="##" data-image-url="${student.packageUrlString}" data-title="${student.packageCode}">签到表</a>
+                    <a class="package-link" href="##" data-image-url="${student.packageUrlString}"
+                       data-title="${student.packageCode}">签到表</a>
                 </c:if>
             </td>
         </tr>
@@ -314,6 +326,7 @@
         $("#exportForm").attr('action', '${ctx}/admin/exam/score/export');
         $("#exportForm").submit();
     }
+
     function goExport2() {
         $("#exportForm").attr('action', '${ctx}/admin/exam/score/export2');
         $("#exportForm").submit();

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

@@ -12,24 +12,24 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-<c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-mark')}">
-	<li><a href="${ctx}/admin/exam/mark?subjectCode=${subject.code}">评卷进度</a></li>
-	</c:if>
-	<c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-group')}">
-    <li><a href="${ctx}/admin/exam/group?subjectCode=${query.subjectCode}">分组管理</a></li>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-mark')}">
+        <li><a href="${ctx}/admin/exam/mark?subjectCode=${subject.code}">评卷进度</a></li>
+    </c:if>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-group')}">
+        <li><a href="${ctx}/admin/exam/group?subjectCode=${query.subjectCode}">分组管理</a></li>
     </c:if>
     <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-marker')}">
-    <li><a href="${ctx}/admin/exam/marker?subjectCode=${query.subjectCode}">评卷员管理</a></li>
+        <li><a href="${ctx}/admin/exam/marker?subjectCode=${query.subjectCode}">评卷员管理</a></li>
     </c:if>
     <li class="active"><a href="##">试评管理</a></li>
     <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-library')}">
-    <li><a href="${ctx}/admin/exam/library?subjectCode=${query.subjectCode}">任务管理</a></li>
-     </c:if>
-        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-arbitrate')}">
-    <li><a href="${ctx}/admin/exam/arbitrate?subjectCode=${query.subjectCode}">仲裁管理</a></li>
+        <li><a href="${ctx}/admin/exam/library?subjectCode=${query.subjectCode}">任务管理</a></li>
+    </c:if>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-arbitrate')}">
+        <li><a href="${ctx}/admin/exam/arbitrate?subjectCode=${query.subjectCode}">仲裁管理</a></li>
     </c:if>
-        <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-quality')}">
-    <li><a href="${ctx}/admin/exam/quality?subjectCode=${query.subjectCode}">质量监控</a></li>
+    <c:if test="${fnx:hasPrivilegeCode(role_privilege_codes, 'exam_mark-quality')}">
+        <li><a href="${ctx}/admin/exam/quality?subjectCode=${query.subjectCode}">质量监控</a></li>
     </c:if>
 </ul>
 <form id="searchForm" action="${ctx}/admin/exam/trial" method="post" class="breadcrumb form-search">
@@ -39,22 +39,27 @@
         <label>科目</label>
         <select class="input-large" id="subject-select" name="subjectCode">
             <c:forEach items="${subjectList}" var="item">
-                <option value="${item.code}" <c:if test="${item.code==query.subjectCode}">selected</c:if>>${item.code}-${item.name}</option>
+                <option value="${item.code}"
+                        <c:if test="${item.code==query.subjectCode}">selected</c:if>>${item.code}-${item.name}</option>
             </c:forEach>
         </select>
         <label>分组</label>
         <select class="input-medium" id="group-select" name="groupNumber">
-        	<option value="" <c:if test="${query.groupNumber==null}">selected</c:if>>不限</option>
+            <option value="" <c:if test="${query.groupNumber==null}">selected</c:if>>不限</option>
             <c:forEach items="${groupList}" var="item">
-                <option value="${item.number}" <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
+                <option value="${item.number}"
+                        <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
             </c:forEach>
         </select>
         <c:if test="${web_user.schoolAdmin==true || forbiddenScore==false}">
-        <label>准考证号</label>
-        <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"/>
-       	</c:if>
+            <label>准考证号</label>
+            <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"
+                    <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}"> disabled="disabled"</c:if>/>
+            />
+        </c:if>
         <label>密号</label>
-        <input type="text" name="secretNumber" id="secretNumber" value="${query.secretNumber}" maxlength="10" class="input-medium"/>
+        <input type="text" name="secretNumber" id="secretNumber" value="${query.secretNumber}" maxlength="10"
+               class="input-medium"/>
         &nbsp;
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
     </div>
@@ -80,19 +85,20 @@
             <td>${result.subjectCode}</td>
             <td>${result.groupNumber}</td>
             <td>
-            	<c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
-	            ***
-	            </c:if>
-	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
-	            ${result.examNumber}
-	            </c:if>
+                <c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
+                    ***
+                </c:if>
+                <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
+                    ${result.examNumber}
+                </c:if>
             </td>
             <td>${result.secretNumber}</td>
             <td>${result.markerLoginName}</td>
-             <td>
+            <td>
                 <c:if test="${result.markerScore!=null}">
-                	<c:if test="${result.markerScore==-1}">未选做</c:if>
-                    <c:if test="${result.markerScore!=-1}"><fmt:formatNumber pattern="###.###" value="${result.markerScore}"/></c:if>
+                    <c:if test="${result.markerScore==-1}">未选做</c:if>
+                    <c:if test="${result.markerScore!=-1}"><fmt:formatNumber pattern="###.###"
+                                                                             value="${result.markerScore}"/></c:if>
                 </c:if>
                 <c:if test="${result.markerScore==null}">
                     &nbsp;
@@ -115,11 +121,12 @@
                 </c:if>
             </td>
             <td>
-               <%--  <c:if test="${result.markerTime!=null}">
-                    <a href="##" class="reset-link" data-id="${result.id}">重置</a>
-                </c:if>
-                        &nbsp; --%>
-                <a href="${ctx}/web/admin/exam/track/trialLibrary?libraryId=${result.id}&subjectCode=${result.subjectCode}" target="_blank">查看</a>
+                    <%--  <c:if test="${result.markerTime!=null}">
+                         <a href="##" class="reset-link" data-id="${result.id}">重置</a>
+                     </c:if>
+                             &nbsp; --%>
+                <a href="${ctx}/web/admin/exam/track/trialLibrary?libraryId=${result.id}&subjectCode=${result.subjectCode}"
+                   target="_blank">查看</a>
             </td>
         </tr>
     </c:forEach>
@@ -153,16 +160,16 @@
             return;
         }
         $.post('${ctx}/admin/exam/group/query', {subjectCode: code, status: 'TRIAL'}, function (result) {
-        	debugger;
+            debugger;
             var parent = $('#group-select');
             var first = '';
             $('<option value="">不限</option>').appendTo(parent);
             for (var i = 0; i < result.length; i++) {
                 var group = result[i];
                 $('<option value="' + group.number + '">' + group.number + '-' + group.title + '</option>').appendTo(parent);
-               /*  if (i == 0) {
-                    first = group.number;
-                } */
+                /*  if (i == 0) {
+                     first = group.number;
+                 } */
             }
             parent.val(first).trigger('change');
         });