|
@@ -53,6 +53,13 @@
|
|
|
<option value="0" <c:if test="${query.absent!=null && query.absent==false}">selected</c:if>>正常</option>
|
|
|
</select>
|
|
|
|
|
|
+ <label>是否违纪</label>
|
|
|
+ <select id="breach" name="breach" class="input-small">
|
|
|
+ <option value="">不限</option>
|
|
|
+ <option value="1" <c:if test="${query.breach!=null && query.breach==true}">selected</c:if>>违纪</option>
|
|
|
+ <option value="0" <c:if test="${query.breach!=null && query.breach==false}">selected</c:if>>正常</option>
|
|
|
+ </select>
|
|
|
+ <!-- 总分 > startScore and 总分 <=endScore -->
|
|
|
<label>总分:从</label>
|
|
|
<input type="text" number="true" name="startScroe"value="${query.startScroe}" class="input-mini"/>
|
|
|
<label> 到 </label>
|
|
@@ -97,6 +104,7 @@
|
|
|
<th>主观总分</th>
|
|
|
<th>试卷总分</th>
|
|
|
<th>是否缺考</th>
|
|
|
+ <th>是否违纪</th>
|
|
|
<th>标记卷类型</th>
|
|
|
<th>阅卷账号</th>
|
|
|
<th>阅卷姓名</th>
|
|
@@ -114,15 +122,56 @@
|
|
|
<td>${student.subjectCode}-${student.subjectName} ${student.subjectRemark}</td>
|
|
|
<td>${student.subjectLevel}</td>
|
|
|
<td>${student.subjectCategory}</td>
|
|
|
- <td>${student.objectiveScoreString}</td>
|
|
|
- <td>${student.subjectiveScoreString}</td>
|
|
|
- <td>${student.totalScoreString}</td>
|
|
|
+ <td style="text-align: center;">
|
|
|
+ <c:choose>
|
|
|
+ <c:when test="${student.absent == true || student.upload == false }">
|
|
|
+ -
|
|
|
+ </c:when>
|
|
|
+ <c:when test="${student.breach == true}">
|
|
|
+ 0
|
|
|
+ </c:when>
|
|
|
+ <c:otherwise>
|
|
|
+ ${student.objectiveScoreString}
|
|
|
+ </c:otherwise>
|
|
|
+ </c:choose>
|
|
|
+ </td>
|
|
|
+ <td style="text-align: center;">
|
|
|
+ <c:choose>
|
|
|
+ <c:when test="${student.absent == true || student.upload == false }">
|
|
|
+ -
|
|
|
+ </c:when>
|
|
|
+ <c:when test="${student.breach == true}">
|
|
|
+ 0
|
|
|
+ </c:when>
|
|
|
+ <c:otherwise>
|
|
|
+ ${student.subjectiveScoreString}
|
|
|
+ </c:otherwise>
|
|
|
+ </c:choose>
|
|
|
+ </td>
|
|
|
+ <td style="text-align: center;">
|
|
|
+ <c:choose>
|
|
|
+ <c:when test="${student.absent == true || student.upload == false }">
|
|
|
+ -
|
|
|
+ </c:when>
|
|
|
+ <c:when test="${student.breach == true}">
|
|
|
+ 0
|
|
|
+ </c:when>
|
|
|
+ <c:otherwise>
|
|
|
+ ${student.totalScoreString}
|
|
|
+ </c:otherwise>
|
|
|
+ </c:choose>
|
|
|
+ </td>
|
|
|
<td>
|
|
|
<!--在成绩查询页面 未上传或者缺考的情况都判断为缺考情况 -->
|
|
|
<c:if test="${student.absent == true || student.upload == false }">
|
|
|
缺考
|
|
|
</c:if>
|
|
|
</td>
|
|
|
+ <td>
|
|
|
+ <c:if test="${student.breach == true}">
|
|
|
+ 违纪
|
|
|
+ </c:if>
|
|
|
+ </td>
|
|
|
<td>
|
|
|
<c:choose>
|
|
|
<c:when test="${student.tagValue == 1}">
|