成绩查询列表中新增“是否上传”列表

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

@@ -53,40 +53,50 @@
 				<option value="0" <c:if test="${query.absent!=null && query.absent==false}">selected</c:if>>正常</option>
 			</select>
 
+            <label>是否上传</label>
+            <select id="upload" name="upload" class="input-small">
+                <option value="">不限</option>
+                <option value="1" <c:if test="${query.upload!=null && query.upload==true}">selected</c:if>>已上传</option>
+                <option value="0" <c:if test="${query.upload!=null && query.upload==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>
+            <br/><br/>
             <!--     总分 > startScore and 总分 <=endScore             -->
 			<label>总分：从</label>
 			<input  type="text" number="true" id="startScroe"  name="startScroe"value="${query.startScroe}" class="input-mini"/>
 			<label> 到&nbsp;&nbsp;&nbsp;</label>
 			<input type="text"  number="true" id="endScroe" name="endScroe"  value="${query.endScroe}"  class="input-mini"/>
-			<br/><br/>
-			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
-			&nbsp;
-			<c:if test="${web_user.type.value==0 || web_user.type.value==5}">
-			<div class="btn-group">
-				<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-					导出<span class="caret"></span>
-				</a>
-				<ul class="dropdown-menu">
-					<li><a href="##" onclick="goExport()">列表导出</a></li>
-					<c:if test="${showExportScore}">
-						<li><a href="##" onclick="goExportScore()">成绩导出</a></li>
-					</c:if>
-				</ul>
-			</div>
-			</c:if>
-			&nbsp;
-			<c:if test="${exam.status.value==0 && web_user.type.value==0}">
-			<a href="${ctx}/admin/exam/score/calculate" class="btn">重新统分</a>
-			</c:if>
-			<c:if test="${exam.status.value==1}">
-			<a href="javascript:void(0)" class="btn" disabled>${exam.status.name}</a>
-			</c:if>
+
+            <div style="float: right;">
+                <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
+                &nbsp;
+                <c:if test="${web_user.type.value==0 || web_user.type.value==5}">
+                    <div class="btn-group">
+                        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+                            导出<span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="##" onclick="goExport()">列表导出</a></li>
+                            <c:if test="${showExportScore}">
+                                <li><a href="##" onclick="goExportScore()">成绩导出</a></li>
+                            </c:if>
+                        </ul>
+                    </div>
+                </c:if>
+                &nbsp;
+                <c:if test="${exam.status.value==0 && web_user.type.value==0}">
+                    <a href="${ctx}/admin/exam/score/calculate" class="btn">重新统分</a>
+                </c:if>
+                <c:if test="${exam.status.value==1}">
+                    <a href="javascript:void(0)" class="btn" disabled>${exam.status.name}</a>
+                </c:if>
+            </div>
 		</div>
 	</form>
 	<tags:message content="${message}"/>
@@ -104,6 +114,7 @@
 				<th>主观总分</th>
 				<th>试卷总分</th>
 				<th>是否缺考</th>
+				<th>是否上传</th>
 				<th>是否违纪</th>
 				<th>标记卷类型</th>
 				<th>阅卷账号</th>
@@ -167,6 +178,16 @@
 						缺考
 					</c:if>
 				</td>
+                <td>
+                    <c:choose>
+                        <c:when test="${student.upload == false }">
+                            未上传
+                        </c:when>
+                        <c:otherwise>
+                            已上传
+                        </c:otherwise>
+                    </c:choose>
+                </td>
                 <td>
                     <c:if test="${student.breach == true}">
                         违纪