Merge branch 'dev_1.5.1' of http://git.qmth.com.cn/luoshi/stmms-ft into dev_1.5.1

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/query/MarkerSearchQuery.java

@@ -21,6 +21,8 @@ public class MarkerSearchQuery extends BaseQuery<Marker> {
     private String name;
 
     private String subjectCodeIn;
+    
+    private Boolean marked;
 
     public void orderById() {
         setSort(new Sort(Direction.ASC, "id"));
@@ -82,4 +84,12 @@ public class MarkerSearchQuery extends BaseQuery<Marker> {
         this.subjectCodeIn = subjectCodeIn;
     }
 
+	public Boolean getMarked() {
+		return marked;
+	}
+
+	public void setMarked(Boolean marked) {
+		this.marked = marked;
+	}
+
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/MarkerServiceImpl.java

@@ -129,6 +129,9 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
             @Override
             public Predicate toPredicate(Root<Marker> root, CriteriaQuery<?> cQuery, CriteriaBuilder cb) {
                 List<Predicate> predicates = new LinkedList<Predicate>();
+                if (query.getMarked() != null&&query.getMarked()) {
+                    predicates.add(cb.gt(root.get("finishCount"), 0));
+                }
                 if (query.getId() != null) {
                     predicates.add(cb.equal(root.get("id"), query.getId()));
                 }

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

@@ -268,6 +268,8 @@
         <label>姓名</label>
         <input type="text" name="name" value="${query.name}" maxlength="30" class="input-small"/>
         &nbsp;
+        <input name="marked" id="marked" type="checkbox" <c:if test="${query.marked}">checked</c:if>/>已评卷
+        &nbsp;
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
         &nbsp;<input id="btnImport" class="btn" type="button" value="导入"/>
         &nbsp;<a href="###" class="btn hide" id="save-button">绑定评卷员</a>

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

@@ -44,6 +44,8 @@
             <select class="input-medium" id="group-select" name="groupNumber">
             <option  value="" <c:if test="${query.groupNumber==null}">selected</c:if>>不限</option>
             </select>
+            &nbsp;
+        	<input name="marked" id="marked" type="checkbox" <c:if test="${query.marked}">checked</c:if>/>已评卷
 			&nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 			<c:if test="${running!=null}">