Browse Source

在评卷员页面生产时修改逻辑:1.校验生产数量非空及数字类型的提示语;2.不对密码进行非空校验,如果有输入值,则保存用户输入的密码,如果没有输入值,则系统后台随机生成6位随机数。

nikang 7 năm trước cách đây
mục cha
commit
c999b6de83

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

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.biz.exam.service.impl;
 import java.sql.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Random;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -114,7 +115,17 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
                 marker.setCommon(true);
                 marker.setExamId(examId);
                 marker.setSubjectCode("");
-                marker.setPassword(password);
+                if(StringUtils.isEmpty(password)){
+                    Random random = new Random();
+                    for (int i=0;i<6;i++)
+                    {
+                        password+=random.nextInt(10);
+                    }
+                    marker.setPassword(password);
+                    password = "";//随机码生产后将密码置空
+                }else {
+                    marker.setPassword(password);
+                }
                 marker.setEnable(true);
                 marker.buildLoginName(start);
                 marker.setName(marker.getLoginName());
@@ -142,7 +153,17 @@ public class MarkerServiceImpl extends BaseQueryService<Marker> implements Marke
                 marker.setCommon(false);
                 marker.setExamId(subject.getExamId());
                 marker.setSubjectCode(subject.getCode());
-                marker.setPassword(password);
+                if(StringUtils.isEmpty(password)){
+                    Random random = new Random();
+                    for (int i=0;i<6;i++)
+                    {
+                        password+=random.nextInt(10);
+                    }
+                    marker.setPassword(password);
+                    password = "";//随机码生产后将密码置空
+                }else {
+                    marker.setPassword(password);
+                }
                 marker.setEnable(true);
                 marker.buildLoginName(start);
                 marker.setName(marker.getLoginName());

+ 3 - 6
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/parameter/ExamMarkerController.java

@@ -1,10 +1,7 @@
 package cn.com.qmth.stmms.admin.exam.parameter;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -206,10 +203,10 @@ public class ExamMarkerController extends BaseParameterController {
 
     @RequestMapping(value = "/batch-create", method = RequestMethod.POST)
     public ModelAndView create(HttpServletRequest request, @RequestParam String subjectCode,
-            @RequestParam Integer count, @RequestParam String password, @RequestParam Boolean common) {
+            @RequestParam Integer count, @RequestParam(required = false) String password, @RequestParam Boolean common) {
         int examId = getSessionExamId(request);
         ModelAndView view = new ModelAndView("redirect:/admin/exam-param/marker");
-        if (examId > 0 && count > 0 && StringUtils.isNotBlank(password)) {
+        if (examId > 0 && count > 0 ) {
             if (common.booleanValue()) {
                 markerService.batchCreateCommon(examId, count, password);
             } else if (!"all".equals(subjectCode)) {

+ 15 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/param/markerCreate.jsp

@@ -8,8 +8,21 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$('#btnSubmit').click(function(){
-				return $.isNumeric($('#count-input').val()) && $('#password-input').val().length>0;
-			});
+			    if($('#count-input').val().length == 0){
+                  alert('请输入创建人数量');
+                  return false;
+                }else{
+                  if(!$.isNumeric($('#count-input').val())){
+                    alert('创建人数必须为数字类型');
+                    return false;
+                  }
+                }
+                if($('#password-input').val().length>0 && $('#password-input').val().length<4){
+			      alert('密码长度最少为4位');
+			      return false;
+                }
+                return true;
+          });
 		});
 	</script>
 </head>