Merge branch 'dev_1.5.0' of http://git.qmth.com.cn/luoshi/stmms-ft.git into dev_1.5.0

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/MarkerDTO.java

@@ -10,19 +10,22 @@ public class MarkerDTO {
     @ExcelField(title = "课程名称", align = 2, sort = 20)
     private String subjectName;
 
-    @ExcelField(title = "评卷分组", align = 2, sort = 30)
+    @ExcelField(title = "学院", align = 2, sort = 30)
+    private String college;
+
+    @ExcelField(title = "评卷分组", align = 2, sort = 40)
     private int groupNumber;
 
-    @ExcelField(title = "分组中题目", align = 2, sort = 40)
+    @ExcelField(title = "分组中题目", align = 2, sort = 50)
     private String groupName;
 
-    @ExcelField(title = "角色", align = 2, sort = 50)
+    @ExcelField(title = "角色", align = 2, sort = 60)
     private String role;
 
-    @ExcelField(title = "账号", align = 2, sort = 60)
+    @ExcelField(title = "账号", align = 2, sort = 70)
     private String loginName;
 
-    @ExcelField(title = "密码", align = 2, sort = 70)
+    @ExcelField(title = "密码", align = 2, sort = 80)
     private String randomPassword;
 
     public MarkerDTO() {
@@ -84,4 +87,11 @@ public class MarkerDTO {
         this.randomPassword = randomPassword;
     }
 
+    public String getCollege() {
+        return college;
+    }
+
+    public void setCollege(String college) {
+        this.college = college;
+    }
 }

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

@@ -1,12 +1,6 @@
 package cn.com.qmth.stmms.admin.user;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -37,15 +31,7 @@ import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.exam.model.SubjectUser;
 import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
-import cn.com.qmth.stmms.biz.exam.service.ExamQuestionService;
-import cn.com.qmth.stmms.biz.exam.service.ExamService;
-import cn.com.qmth.stmms.biz.exam.service.ExamStudentService;
-import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
-import cn.com.qmth.stmms.biz.exam.service.MarkGroupService;
-import cn.com.qmth.stmms.biz.exam.service.MarkerService;
-import cn.com.qmth.stmms.biz.exam.service.SubjectUserService;
-import cn.com.qmth.stmms.biz.exam.service.UserExamService;
-import cn.com.qmth.stmms.biz.exam.service.UserStudentService;
+import cn.com.qmth.stmms.biz.exam.service.*;
 import cn.com.qmth.stmms.biz.user.model.User;
 import cn.com.qmth.stmms.biz.user.service.UserService;
 import cn.com.qmth.stmms.biz.user.service.query.UserSearchQuery;
@@ -99,7 +85,7 @@ public class UserController extends BaseExamController {
 
     @Autowired
     private UserStudentService userStudentService;
-    
+
     @Autowired
     private SystemAuthService systemAuthService;
 
@@ -411,6 +397,7 @@ public class UserController extends BaseExamController {
             if (query.getRole() != null && query.getRole().equals(Role.MARKER)) {
                 Map<String, ExamSubject> subjectMap = new HashMap<String, ExamSubject>();
                 Map<String, MarkGroup> groupMap = new HashMap<String, MarkGroup>();
+                Map<String, String> collegeMap = new HashMap<String, String>();
                 MarkerSearchQuery mQuery = new MarkerSearchQuery();
                 mQuery.setExamId(examId);
                 mQuery.setLoginName(query.getLoginName());
@@ -424,6 +411,9 @@ public class UserController extends BaseExamController {
                     if (subject == null) {
                         subject = subjectService.find(examId, m.getSubjectCode());
                         subjectMap.put(m.getSubjectCode(), subject);
+                        List<String> colleges = studentService.findDistinctCollegeBySubjectCode(examId,
+                                m.getSubjectCode());
+                        collegeMap.put(m.getSubjectCode(), StringUtils.join(colleges, SPLIT));
                     }
                     s.setSubjectCode(m.getSubjectCode());
                     s.setSubjectName(subject.getName());
@@ -441,6 +431,7 @@ public class UserController extends BaseExamController {
                     User u = userService.findById(m.getUserId());
                     s.setLoginName(u.getLoginName());
                     s.setRandomPassword(u.getRandomPassword());
+                    s.setCollege(collegeMap.get(m.getSubjectCode()));
                     list.add(s);
                 }
                 new ExportExcel("评卷员数据", MarkerDTO.class).setDataList(list).write(response, fileName).dispose();
@@ -541,26 +532,26 @@ public class UserController extends BaseExamController {
     @RoleRequire(Role.SCHOOL_ADMIN)
     public String batchSave(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam Role role, @RequestParam(required = false) String password, @RequestParam Integer number,
-            @RequestParam String subjectCodeString, @RequestParam(required = false) Boolean random
-            ,@RequestParam(required = false) String prefix) {
-    	SystemAuth systemAuth = systemAuthService.findOne();
-    	if(SystemAuthType.OFFLINE.equals(systemAuth.getType())) {
-    		if(StringUtils.isBlank(prefix)) {
-        		addErrMessage(redirectAttributes,null, "请填写自定义前缀");
-        		return "redirect:/admin/user/batchAdd";
-        	}
-    	}else {
-    		prefix=null;
-    	}
+            @RequestParam String subjectCodeString, @RequestParam(required = false) Boolean random,
+            @RequestParam(required = false) String prefix) {
+        SystemAuth systemAuth = systemAuthService.findOne();
+        if (SystemAuthType.OFFLINE.equals(systemAuth.getType())) {
+            if (StringUtils.isBlank(prefix)) {
+                addErrMessage(redirectAttributes, null, "请填写自定义前缀");
+                return "redirect:/admin/user/batchAdd";
+            }
+        } else {
+            prefix = null;
+        }
         int examId = getSessionExamId(request);
         if (Role.MARKER.equals(role)) {
             int successNum = userService.batchSaveMarker(examId, getSubjectCodeSet(subjectCodeString), number, password,
-                    random == null ? false : random,prefix);
+                    random == null ? false : random, prefix);
             String message = "已成功新增 " + successNum + " 条用户";
             addMessage(redirectAttributes, message);
         } else {
             int successNum = userService.batchSaveSubjectUser(examId, role, getSubjectCodeSet(subjectCodeString),
-                    number, password, random == null ? false : random,prefix);
+                    number, password, random == null ? false : random, prefix);
             String message = "已成功新增 " + successNum + " 条用户";
             addMessage(redirectAttributes, message);
         }