fixbugs

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

@@ -2,7 +2,6 @@ package cn.com.qmth.stmms.admin.exam;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -96,13 +95,6 @@ public class MarkController extends BaseExamController {
         if (wu.isSubjectHeader()) {
             String subjectCodeIn = StringUtils.join(wu.getSubjectCodeSet(), ",");
             query.setCodeIn(subjectCodeIn);
-            Set<String> result = new HashSet<String>();
-            result.addAll(wu.getSubjectCodeSet());
-            result.retainAll(unFinishSet);
-            if (!query.getFinished()) {
-                String unFinishResult = StringUtils.join(result, ",");
-                query.setCodeNotIn(unFinishResult);
-            }
         }
         query = subjectService.findByQuery(query);
 

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

@@ -30,12 +30,14 @@
 				<option value="${subject.code}" <c:if test="${subject.code==query.code}">selected</c:if>>${subject.code}-${subject.name}</option>
 				</c:forEach>
 			</select>
+			<c:if test="${web_user.schoolAdmin==true }">
 			<label>完成进度</label>
 			<select class="input-small" name="finished">
 				<option value="" <c:if test="${null==query.finished}">selected</c:if>>请选择</option>
 				<option value="1" <c:if test="${query.finished!=null &&query.finished}">selected</c:if>>已完成</option>
 				<option value="0" <c:if test="${query.finished!=null &&!query.finished}">selected</c:if>>未完成</option>
 			</select>
+			</c:if>
 			&nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 			&nbsp;