fix

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

@@ -164,6 +164,7 @@ public class ArbitrateController extends BaseExamController {
             subjectCode = history.getSubjectCode();
             group = groupService.findOne(examId, subjectCode, history.getGroupNumber());
             setting.accumulate("selective", group.isSelective());
+            setting.accumulate("arbitrateType", group.getArbitrateType());
         }
         if (subjectCode != null && groupNumber != null) {
             group = groupService.findOne(examId, subjectCode, groupNumber);

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

@@ -56,6 +56,11 @@ public class CollationLabelController extends BaseExamController {
             addMessage(redirectAttributes, "名称不能为空");
             return "redirect:/admin/exam/collationLabel/add?examId=" + examId;
         }
+        CollationLabel old = collationLabelService.find(examId,collationLabel.getCode());
+        if(old!=null){
+            addMessage(redirectAttributes, "代码已存在");
+            return "redirect:/admin/exam/collationLabel/add?examId=" + examId;
+        }
         collationLabel.setExamId(examId);
         collationLabel.setUpdateTime(new Date());
         collationLabel = collationLabelService.save(collationLabel);

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

@@ -97,7 +97,7 @@
 		<div class="control-group">
 			<label class="control-label">给分次数</label>
 			<div class="controls">
-				<input name="trackCount" value="${examQuestion.trackCount }" type="number" htmlEscape="false" max="10000" min="1" class="required"/>
+				<input name="trackCount" value="${examQuestion.trackCount }" type="number" htmlEscape="false" max="10000" min="1"/>
 			</div>
 		</div>
 		<div class="control-group">

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

@@ -93,7 +93,7 @@
 		<div class="control-group">
 			<label class="control-label">给分次数</label>
 			<div class="controls">
-				<input <c:if test="${!examQuestion.objective && !enableUpdate}">disabled</c:if> name="trackCount" value="${examQuestion.trackCount }" type="number" htmlEscape="false" max="10000" min="1" class="required"/>
+				<input <c:if test="${!examQuestion.objective && !enableUpdate}">disabled</c:if> name="trackCount" value="${examQuestion.trackCount }" type="number" htmlEscape="false" max="10000" min="1" />
 			</div>
 		</div>
 		<div class="control-group">