成绩校验

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

@@ -14,7 +14,7 @@ public class ScoreVerifyQuery extends BaseQuery<ScoreVerifyVo> {
 	private ScoreVerifyRule rule;
 
 	private ScoreVerifyRuleCompare ruleCompare;
-
+	private Integer fromScore;
 	private Integer compareScore;
 
 	private Integer examId;
@@ -77,5 +77,13 @@ public class ScoreVerifyQuery extends BaseQuery<ScoreVerifyVo> {
 		this.userId = userId;
 	}
 
+	public Integer getFromScore() {
+		return fromScore;
+	}
+
+	public void setFromScore(Integer fromScore) {
+		this.fromScore = fromScore;
+	}
+
 
 }

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

@@ -124,7 +124,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 			if (req.getRuleCompare() == null) {
 				throw new StatusException("请选择分数匹配条件");
 			}
-			if (req.getCompareScore() == null) {
+			if (req.getCompareScore() == null||req.getFromScore()==null) {
 				throw new StatusException("请填写匹配分值");
 			}
 		}
@@ -215,7 +215,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		} else if (ScoreVerifyRule.RULE2.equals(rule)) {
 			for (ScoreVerifyVo vo : vos) {
 				double totalScore = Calculator.add(vo.getObjectiveScore(), vo.getSubjectiveScore());
-				if (totalScore <= 5) {
+				if (totalScore <= req.getFromScore()) {
 					group1.add(vo);
 				}
 				if (ScoreVerifyRuleCompare.EQUALS.equals(req.getRuleCompare())
@@ -232,7 +232,7 @@ public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implem
 		} else if (ScoreVerifyRule.RULE3.equals(rule)) {
 			for (ScoreVerifyVo vo : vos) {
 				double totalScore = Calculator.add(vo.getObjectiveScore(), vo.getSubjectiveScore());
-				if (totalScore <= 10) {
+				if (totalScore >= req.getFromScore()) {
 					group1.add(vo);
 				}
 				if (ScoreVerifyRuleCompare.EQUALS.equals(req.getRuleCompare())

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

@@ -37,18 +37,24 @@
 				class="input-large" name="rule" id="rule">
 				<option value="">请选择</option>
 				<option value="RULE1">单科目有分，其它科目0分或无分</option>
-				<option value="RULE2">单科目分值小于等于5分，其它科目</option>
-				<option value="RULE3">单科目分值小于等于10分，其它科目</option>
-			</select> <span id="span-ruleCompare" hidden="true"> <select
-				class="input-small" name="ruleCompare" id="ruleCompare">
-					<option value="">请选择</option>
-					<option value="EQUALS">等于</option>
-					<option value="GT">大于</option>
-					<option value="LT">小于</option>
-			</select> <input name="compareScore" id="compareScore"
-				class="input-mini" maxlength="5" type="text" oninput="this.value = this.value.replace(/[^0-9]/g, '')"/>
-			</span> <input id="btnQuery" class="btn" type="button" value="查询"
-				onclick="query()" />
+				<option value="RULE2">单科目分值小于等于</option>
+				<option value="RULE3">单科目分值大于等于</option>
+			</select> 
+			<span id="span-ruleCompare" hidden="true"> 
+				<input name="fromScore" id="fromScore"
+					class="input-mini" maxlength="5" type="text" oninput="this.value = this.value.replace(/[^0-9]/g, '')"/>
+				分，其它科目
+				<select
+					class="input-small" name="ruleCompare" id="ruleCompare">
+						<option value="">请选择</option>
+						<option value="EQUALS">等于</option>
+						<option value="GT">大于</option>
+						<option value="LT">小于</option>
+				</select> 
+				<input name="compareScore" id="compareScore"
+					class="input-mini" maxlength="5" type="text" oninput="this.value = this.value.replace(/[^0-9]/g, '')"/>
+			</span> 
+			<input id="btnQuery" class="btn" type="button" value="查询" onclick="query()" />
 		</div>
 	</form>
 	<tags:message content="${message}" />
@@ -66,7 +72,7 @@
 					alert("请选择分数匹配条件");
 					return false;
 				}
-				if ($("#compareScore").val() == '') {
+				if ($("#compareScore").val() == ''||$("#fromScore").val() == '') {
 					alert("请填写匹配分值");
 					return false;
 				}
@@ -75,6 +81,10 @@
 					alert("分值请输入大于等于0的整数");
 					return false;
 				}
+				if (!pattern.test($("#fromScore").val())) {
+					alert("分值请输入大于等于0的整数");
+					return false;
+				}
 			}
 			$("#searchForm").submit();
 		}
@@ -85,6 +95,7 @@
 			} else {
 				$('#span-ruleCompare').hide();
 				$("#ruleCompare").val("").trigger('change');
+				$('#fromScore').val("");
 				$('#compareScore').val("");
 			}
 		});