ting.yin 3 anni fa
parent
commit
bb8d53c05f

+ 18 - 18
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/query/MarkLibrarySearchQuery.java

@@ -31,9 +31,9 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
 
     private Double markerScore;
 
-    private Double startScroe;
+    private Double startScore;
 
-    private Double endScroe;
+    private Double endScore;
 
     private boolean unselective;
 
@@ -146,22 +146,6 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
         this.markerScore = markerScore;
     }
 
-    public Double getStartScroe() {
-        return startScroe;
-    }
-
-    public void setStartScroe(Double startScroe) {
-        this.startScroe = startScroe;
-    }
-
-    public Double getEndScroe() {
-        return endScroe;
-    }
-
-    public void setEndScroe(Double endScroe) {
-        this.endScroe = endScroe;
-    }
-
     public boolean isUnselective() {
         return unselective;
     }
@@ -186,4 +170,20 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
         this.headerId = headerId;
     }
 
+    public Double getStartScore() {
+        return startScore;
+    }
+
+    public void setStartScore(Double startScore) {
+        this.startScore = startScore;
+    }
+
+    public Double getEndScore() {
+        return endScore;
+    }
+
+    public void setEndScore(Double endScore) {
+        this.endScore = endScore;
+    }
+
 }

+ 7 - 7
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkLibraryServiceImpl.java

@@ -133,17 +133,17 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                 if (query.getMarkerScore() != null) {
                     predicates.add(cb.equal(root.get("markerScore"), query.getMarkerScore()));
                 }
-                if (query.getStartScroe() != null) {
-                    Predicate predicate1 = cb.ge(root.get("markerScore"), query.getStartScroe());
+                if (query.getStartScore() != null) {
+                    Predicate predicate1 = cb.ge(root.get("markerScore"), query.getStartScore());
                     predicates.add(predicate1);
                 }
-                if (query.getEndScroe() != null) {
-                    Predicate predicate2 = cb.le(root.get("markerScore"), query.getEndScroe());
+                if (query.getEndScore() != null) {
+                    Predicate predicate2 = cb.le(root.get("markerScore"), query.getEndScore());
                     predicates.add(predicate2);
                 }
-                if (query.getMarkerScore() != null && query.getStartScroe() != null) {
-                    Predicate predicate1 = cb.ge(root.get("markerScore"), query.getStartScroe());
-                    Predicate predicate2 = cb.le(root.get("markerScore"), query.getEndScroe());
+                if (query.getMarkerScore() != null && query.getStartScore() != null) {
+                    Predicate predicate1 = cb.ge(root.get("markerScore"), query.getStartScore());
+                    Predicate predicate2 = cb.le(root.get("markerScore"), query.getEndScore());
                     predicates.add(cb.and(predicate1, predicate2));
                 }
                 if (query.isUnselective()) {

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

@@ -65,9 +65,9 @@
         <input type="text" name="secretNumber" id="secretNumber" value="${query.secretNumber}" class="input-medium"/>
         &nbsp;
         <label>总分:从</label>
-        <input type="number" id="startScroe" name="startScroe" value="${query.startScroe}" class="input-mini"/>
+        <input type="number" id="startScore" name="startScore" value="${query.startScore}" class="input-mini"/>
         <label> 到&nbsp;&nbsp;&nbsp;</label>
-        <input type="number" id="endScroe" name="endScroe" value="${query.endScroe}" class="input-mini"/>
+        <input type="number" id="endScore" name="endScore" value="${query.endScore}" class="input-mini"/>
         &nbsp;
         <label>小题得分</label>
         <input type="text" number="true" name="questionScore" id="questionScore" value="${query.questionScore }" class="input-mini"/>
@@ -75,7 +75,8 @@
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
         &nbsp;
         <c:if test="${examType!='MULTI_MEDIA' && inspectedCount!=null}">
-            <a target="_blank" href="${ctx}/web/admin/exam/library/inspected/start?subjectCode=${query.subjectCode}&groupNumber=${query.groupNumber}" class="btn">待复核:${inspectedCount }</a>
+            <a 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}"
+             class="btn">待复核:${inspectedCount }</a>
         </c:if>
     </div>
 </form>
@@ -221,22 +222,22 @@
     }
 
     function goSearch() {
-        var startScroe = $("#startScroe").val();
-        var endScore = $("#endScroe").val();
-        if (startScroe.length > 0) {
+        var startScore = $("#startScore").val();
+        var endScore = $("#endScore").val();
+        if (startScore.length > 0) {
             if (endScore.length == 0) {
                 alert("请输入结束分数值!");
                 return false;
             }
         }
         if (endScore.length > 0) {
-            if (startScroe.length == 0) {
+            if (startScore.length == 0) {
                 alert("请输入开始分数值!");
                 return false;
             }
         }
-        if (endScore.length > 0 && startScroe.length > 0) {
-            if (parseInt(startScroe) > parseInt(endScore)) {
+        if (endScore.length > 0 && startScore.length > 0) {
+            if (parseInt(startScore) > parseInt(endScore)) {
                 alert("开始分值必须小于结束分值");
                 return false;
             }