update

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

@@ -32,8 +32,6 @@ public interface UserService {
 
     void batchSaveSubjectUser(int examId, Role role, String[] subjectCodes, Integer number);
 
-    void batchSaveCollegeUser(int examId, Integer number);
-
     public int findMaxNumberByLoginNameStart(String prefix);
 
 }

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

@@ -339,44 +339,46 @@ public class UserServiceImpl implements UserService {
         subjectUserService.batchSave(saveList);
     }
 
-    @Override
-    public void batchSaveCollegeUser(int examId, Integer number) {
-        Exam exam = examService.findById(examId);
-        List<String> collegeList = studentService.findDistinctCollege(examId);
-        List<SubjectUser> saveList = new ArrayList<SubjectUser>();
-        for (String college : collegeList) {
-            List<String> subjectList = studentService.findDistinctSubjectCodeByCollege(examId, college);
-            for (int i = 0; i < number; i++) {
-                String prefix = exam.getSchoolId() + "-XY-";
-                int maxNumber = this.findMaxNumberByLoginNameStart(prefix);
-                String loginName = prefix + "-" + (maxNumber + i + 1);
-                User user = userDao.findFirstByLoginName(loginName);
-                if (user == null) {
-                    user = new User();
-                    user.setLoginName(loginName);
-                    user.setName(loginName);
-                    user.setPassword(EncryptUtils.md5(USER_PASSWORD));
-                    user.setRole(Role.COLLEGE_ADMIN);
-                    user.setSource(UserSource.INTERNAL);
-                    user.setEnable(true);
-                    user.setSchoolId(exam.getSchoolId());
-                    user.setCreatedTime(new Date());
-                    userDao.save(user);
-                }
-                for (String subjectCode : subjectList) {
-                    SubjectUser subjectUser = subjectUserService.findBySubjectCodeAndUserId(subjectCode, user.getId());
-                    if (subjectUser == null) {
-                        subjectUser = new SubjectUser();
-                        subjectUser.setSubjectCode(subjectCode);
-                        subjectUser.setUserId(user.getId());
-                        saveList.add(subjectUser);
-                    }
-                }
-                subjectUserService.batchSave(saveList);
-            }
-        }
-
-    }
+    // @Override
+    // public void batchSaveCollegeUser(int examId, Integer number) {
+    // Exam exam = examService.findById(examId);
+    // List<String> collegeList = studentService.findDistinctCollege(examId);
+    // List<SubjectUser> saveList = new ArrayList<SubjectUser>();
+    // for (String college : collegeList) {
+    // List<String> subjectList =
+    // studentService.findDistinctSubjectCodeByCollege(examId, college);
+    // for (int i = 0; i < number; i++) {
+    // String prefix = exam.getSchoolId() + "-XY-";
+    // int maxNumber = this.findMaxNumberByLoginNameStart(prefix);
+    // String loginName = prefix + "-" + (maxNumber + i + 1);
+    // User user = userDao.findFirstByLoginName(loginName);
+    // if (user == null) {
+    // user = new User();
+    // user.setLoginName(loginName);
+    // user.setName(loginName);
+    // user.setPassword(EncryptUtils.md5(USER_PASSWORD));
+    // user.setRole(Role.COLLEGE_ADMIN);
+    // user.setSource(UserSource.INTERNAL);
+    // user.setEnable(true);
+    // user.setSchoolId(exam.getSchoolId());
+    // user.setCreatedTime(new Date());
+    // userDao.save(user);
+    // }
+    // for (String subjectCode : subjectList) {
+    // SubjectUser subjectUser =
+    // subjectUserService.findBySubjectCodeAndUserId(subjectCode, user.getId());
+    // if (subjectUser == null) {
+    // subjectUser = new SubjectUser();
+    // subjectUser.setSubjectCode(subjectCode);
+    // subjectUser.setUserId(user.getId());
+    // saveList.add(subjectUser);
+    // }
+    // }
+    // subjectUserService.batchSave(saveList);
+    // }
+    // }
+    //
+    // }
 
     @Override
     public int findMaxNumberByLoginNameStart(String prefix) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -363,8 +363,6 @@ public class UserController extends BaseExamController {
         int examId = getSessionExamId(request);
         if (Role.MARKER.equals(role)) {
             userService.batchSaveMarker(examId, subejctCodes, number, password);
-        } else if (Role.COLLEGE_ADMIN.equals(role)) {
-            userService.batchSaveCollegeUser(examId, number);
         } else {
             userService.batchSaveSubjectUser(examId, role, subejctCodes, number);
         }