fixbugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/impl/UserServiceImpl.java

@@ -309,12 +309,12 @@ public class UserServiceImpl implements UserService {
         Exam exam = examService.findById(examId);
         List<SubjectUser> saveList = new ArrayList<SubjectUser>();
         int createNumber = 1;
+        String prefix = exam.getSchoolId() + "-" + subjectCode;
+        if (role.equals(Role.INSPECTOR)) {
+            prefix = exam.getSchoolId() + "-FH-" + subjectCode;
+        }
+        int maxNumber = this.findMaxNumberByLoginNameStart(prefix);
         while (saveList.size() < number) {
-            String prefix = exam.getSchoolId() + "-" + subjectCode;
-            if (role.equals(Role.INSPECTOR)) {
-                prefix = exam.getSchoolId() + "-FH-" + subjectCode;
-            }
-            int maxNumber = this.findMaxNumberByLoginNameStart(prefix);
             String loginName = prefix + "-" + (maxNumber + createNumber);
             User user = userDao.findFirstByLoginName(loginName);
             if (user == null) {

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

@@ -32,6 +32,20 @@
                     $(".objectiveDiv").hide();
                 }
             });
+            
+            $('#btnSubmit').click(function () {
+                    var score = $('#interval-score-input').val();
+                    if (score == '' || score<0.1) {
+                    	alert('间隔分不能为空且大于等于0.1分');
+                    	return false;
+                    }
+                    var total = $('#total-score-input').val();
+                    if (total == '' || total<=0) {
+                    	alert('满分不能为空且大于等于0分');
+                    	return false;
+                    }
+                    $('#inputForm').submit();
+            });
         });
     </script>
 </head>
@@ -70,7 +84,7 @@
 		<div class="control-group">
 			<label class="control-label">满分</label>
 			<div class="controls">
-			 <input name="totalScore" value="${examQuestion.totalScore }" type="number" htmlEscape="false"  maxlength="10" class="required"/>
+			 <input name="totalScore" value="${examQuestion.totalScore }" type="number" id="total-score-input" htmlEscape="false"  maxlength="10" class="required"/>
 			</div>
 		</div>
 		<div class="control-group">
@@ -82,7 +96,7 @@
 			<div class="control-group">
 	            <label class="control-label">间隔分</label>
 	            <div class="controls">
-	                <input type="number" name="intervalScore" class="required interval-score-input" htmlEscape="false" maxlength="10" class="required digits"
+	                <input type="number" name="intervalScore" class="required " id="interval-score-input" htmlEscape="false" maxlength="10" class="required digits"
 	                       value="${examQuestion.intervalScore}"/>
 	            </div>
 	        </div>

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

@@ -27,6 +27,19 @@
             }else{
 	            $(".objectiveDiv").hide();
             }
+            $('#btnSubmit').click(function () {
+                var score = $('#interval-score-input').val();
+                if (score == '' || score<0.1) {
+                	alert('间隔分不能为空且大于等于0.1分');
+                	return false;
+                }
+                var total = $('#total-score-input').val();
+                if (total == '' || total<=0) {
+                	alert('满分不能为空且大于等于0分');
+                	return false;
+                }
+                $('#inputForm').submit();
+        });
         });
     </script>
 </head>
@@ -66,7 +79,7 @@
 		<div class="control-group">
 			<label class="control-label">满分</label>
 			<div class="controls">
-			 <input name="totalScore" value="${examQuestion.totalScore }" type="number" htmlEscape="false"  maxlength="10" class="required"/>
+			 <input name="totalScore" value="${examQuestion.totalScore }" type="number" id="total-score-input" htmlEscape="false"  maxlength="10" class="required"/>
 			</div>
 		</div>
 		<div class="control-group">
@@ -79,7 +92,7 @@
 			<div class="control-group">
 	            <label class="control-label">间隔分</label>
 	            <div class="controls">
-	                <input type="number" name="intervalScore" class="required interval-score-input" htmlEscape="false" maxlength="10" class="required digits"
+	                <input type="number" name="intervalScore" class="required" id="interval-score-input" htmlEscape="false" maxlength="10" class="required digits"
 	                       value="${examQuestion.intervalScore}"/>
 	            </div>
 	        </div>