修复导入评卷员班级；科组长登录考试逆序；删除成绩导出学习中心；科组长导出成绩问题；

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamDao.java

@@ -43,7 +43,7 @@ public interface ExamDao extends PagingAndSortingRepository<Exam, Integer>, JpaS
     public List<Exam> findByMarkerUserId(Integer userId, Date time);
 
     @Query(value = "select * from eb_exam e where e.id in (select s.exam_id from eb_exam_subject s where s.code in (select su.subject_code from eb_subject_user su where su.user_id=?1) )"
-            + "order by e.id", nativeQuery = true)
+            + "order by e.id desc", nativeQuery = true)
     public List<Exam> findBySubjectHeaderUserId(Integer userId);
 
     @Modifying

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

@@ -10,9 +10,6 @@ import cn.com.qmth.stmms.common.annotation.ExcelField;
 
 public class ExamStudentDTO {
 
-    @ExcelField(title = "学习中心", align = 2, sort = 10)
-    private String campusName;
-
     @ExcelField(title = "课程代码", align = 2, sort = 20)
     private String subjectCode;
 
@@ -59,11 +56,10 @@ public class ExamStudentDTO {
     private String teacher;
 
     private List<ScoreItem> objectiveList;
-    
+
     private List<ScoreItem> subjectiveList;
 
     public ExamStudentDTO(ExamStudent student) {
-        setCampusName(student.getCampusName());
         setSubjectCode(student.getSubjectCode());
         setSubjectName(student.getSubjectName());
         setSubjectLevel(student.getSubjectLevel());
@@ -83,14 +79,6 @@ public class ExamStudentDTO {
         setSubjectiveList(student.getScoreList(false));
     }
 
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
-
     public String getSubjectCode() {
         return subjectCode;
     }
@@ -211,25 +199,20 @@ public class ExamStudentDTO {
         this.teacher = teacher;
     }
 
-    
     public List<ScoreItem> getObjectiveList() {
         return objectiveList;
     }
 
-    
     public void setObjectiveList(List<ScoreItem> objectiveList) {
         this.objectiveList = objectiveList;
     }
 
-    
     public List<ScoreItem> getSubjectiveList() {
         return subjectiveList;
     }
 
-    
     public void setSubjectiveList(List<ScoreItem> subjectiveList) {
         this.subjectiveList = subjectiveList;
     }
 
-
 }

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

@@ -88,7 +88,6 @@ public class ImageCheckController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ExamStudentSearchQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
-        WebUser wu = RequestUtils.getWebUser(request);
         List<ExceptionStudentDTO> list = new LinkedList<ExceptionStudentDTO>();
         query.setExamId(getSessionExamId(request));
         query.setUpload(true);

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

@@ -2,10 +2,8 @@ package cn.com.qmth.stmms.admin.exam;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -84,7 +82,7 @@ public class MarkController extends BaseExamController {
         int examId = getSessionExamId(request);
         query.setExamId(examId);
         // query.setUploadCountGt(0);
-        if (wu.isSubjectHeader()) {
+        if (wu.isSubjectHeader() && StringUtils.isBlank(query.getCode())) {
             String subjectCodeIn = StringUtils.join(wu.getSubjectCodeSet(), ",");
             query.setCodeIn(subjectCodeIn);
         }
@@ -165,11 +163,7 @@ public class MarkController extends BaseExamController {
         List<MarkerInfoDTO> result = new LinkedList<MarkerInfoDTO>();
         List<Marker> list = markerService.getMarkCount(examId);
         if (wu.isSubjectHeader()) {
-            Set<String> subjectCodes = new HashSet<String>();
-            for (ExamSubject subject : getExamSubject(examId, wu)) {
-                subjectCodes.add(subject.getCode());
-            }
-            list = markerService.getMarkCount(examId, subjectCodes);
+            list = markerService.getMarkCount(examId, wu.getSubjectCodeSet());
         }
         for (Marker marker : list) {
             MarkGroup group = groupService.findOne(examId, marker.getSubjectCode(), marker.getGroupNumber());

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

@@ -109,14 +109,7 @@ public class PaperController extends BaseExamController {
     @RequestMapping("/detail")
     public String detail(Model model, HttpServletRequest request, @RequestParam String subjectCode,
             @RequestParam(required = false) Boolean objective) {
-        WebUser wu = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (wu.isSubjectHeader()
-        // TODO - subjectheader check
-        // &&!subjectCode.equals(wu.getUser().getSubjectCode())
-        ) {
-            return "redirect:/admin/exam/paper";
-        }
         ExamSubject subject = subjectService.find(examId, subjectCode);
         if (subject != null) {
             List<ExamQuestion> list = new LinkedList<ExamQuestion>();

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

@@ -30,10 +30,12 @@ import cn.com.qmth.stmms.biz.mark.query.ProblemHistorySearchQuery;
 import cn.com.qmth.stmms.biz.mark.service.ProblemHistoryService;
 import cn.com.qmth.stmms.biz.mark.service.ProblemTypeService;
 import cn.com.qmth.stmms.common.annotation.Logging;
+import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.HistoryStatus;
 import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.enums.MarkStatus;
 import cn.com.qmth.stmms.common.utils.DateUtils;
+import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 @Controller
 @RequestMapping("/admin/exam/problem/history")
@@ -65,6 +67,7 @@ public class ProblemHistoryController extends BaseExamController {
     @Logging(menu = "问题卷查询", type = LogType.QUERY)
     @RequestMapping
     public String list(HttpServletRequest request, Model model, ProblemHistorySearchQuery query) {
+        WebUser wu = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         List<ProblemType> problemTypes = problemService.findByExamId(examId);
         Map<Integer, ProblemType> problemMap = new HashMap<Integer, ProblemType>();
@@ -87,7 +90,7 @@ public class ProblemHistoryController extends BaseExamController {
         }
         model.addAttribute("resultList", list);
         model.addAttribute("query", query);
-        model.addAttribute("subjectList", getProblemSubject(examId));
+        model.addAttribute("subjectList", getProblemSubject(examId, wu));
         model.addAttribute("problemList", problemTypes);
         List<MarkGroup> groupList = groupService.findByExamAndSubjectAndStatus(examId, query.getSubjectCode(),
                 MarkStatus.FORMAL);
@@ -103,7 +106,7 @@ public class ProblemHistoryController extends BaseExamController {
         return "modules/exam/problemHistory";
     }
 
-    private List<ExamSubject> getProblemSubject(int examId) {
+    private List<ExamSubject> getProblemSubject(int examId, WebUser wu) {
         List<ExamSubject> list = new LinkedList<ExamSubject>();
         List<String> codes = historyService.findProblemSubjectCode(examId);
         for (String code : codes) {
@@ -112,6 +115,8 @@ public class ProblemHistoryController extends BaseExamController {
                 list.add(subject);
             }
         }
+        List<ExamSubject> subjects = getExamSubject(examId, wu);
+        list.retainAll(subjects);
         return list;
     }
 

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

@@ -92,7 +92,7 @@ public class ScoreController extends BaseExamController {
             query.setObjectiveScoreGt(0d);
             query.setSubjectiveScore(0d);
         }
-        if (wu.isSubjectHeader()) {
+        if (wu.isSubjectHeader() && StringUtils.isBlank(query.getSubjectCode())) {
             String subjectCodeIn = StringUtils.join(wu.getSubjectCodeSet(), ",");
             query.setSubjectCodeIn(subjectCodeIn);
         }
@@ -185,6 +185,7 @@ public class ScoreController extends BaseExamController {
             addMessage(redirectAttributes, "请选择正确的考试");
             return "redirect:/admin/exam/score";
         }
+        query.setExamId(exam.getId());
         Set<String> subjectSet = new HashSet<>();
         // 单科目导出
         if (StringUtils.isNotBlank(query.getSubjectCode())) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectClassController.java

@@ -46,10 +46,6 @@ public class ReportSubjectClassController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
@@ -66,12 +62,7 @@ public class ReportSubjectClassController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
-        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectCollegeController.java

@@ -46,10 +46,6 @@ public class ReportSubjectCollegeController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
@@ -66,12 +62,7 @@ public class ReportSubjectCollegeController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
-        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectController.java

@@ -47,7 +47,7 @@ public class ReportSubjectController extends BaseExamController {
         WebUser wu = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         query.setExamId(examId);
-        if (wu.isSubjectHeader()) {
+        if (wu.isSubjectHeader() && StringUtils.isBlank(query.getSubjectCode())) {
             String subjectCodeIn = StringUtils.join(wu.getSubjectCodeSet(), ",");
             query.setSubjectCodeIn(subjectCodeIn);
         }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectGroupController.java

@@ -51,10 +51,6 @@ public class ReportSubjectGroupController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
@@ -73,12 +69,7 @@ public class ReportSubjectGroupController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
-        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectQuestionController.java

@@ -50,10 +50,6 @@ public class ReportSubjectQuestionController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
@@ -71,12 +67,7 @@ public class ReportSubjectQuestionController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
-        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherClassController.java

@@ -51,10 +51,6 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
@@ -75,12 +71,7 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
-        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherController.java

@@ -46,10 +46,6 @@ public class ReportSubjectTeacherController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);
@@ -66,12 +62,7 @@ public class ReportSubjectTeacherController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
-        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        if (webuser.isSubjectHeader()) {
-            // TODO - subjectheader check
-            //query.setSubjectCode(webuser.getUser().getSubjectCode());
-        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

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

@@ -44,10 +44,10 @@ public class UserClassController extends BaseExamController {
     @RequestMapping(value = "/template")
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
         try {
-            String fileName = "用户班级导入模板.xlsx";
+            String fileName = "评卷员班级导入模板.xlsx";
             List<MarkerClass> list = new ArrayList<MarkerClass>();
             list.add(new MarkerClass());
-            new ExportExcel("用户班级数据", MarkerClass.class, 2).setDataList(list).write(response, fileName).dispose();
+            new ExportExcel("评卷员班级数据", MarkerClass.class, 2).setDataList(list).write(response, fileName).dispose();
             return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导入模板下载失败！失败信息：" + e.getMessage());
@@ -138,7 +138,7 @@ public class UserClassController extends BaseExamController {
             user.setLoginName(loginName);
             user.setName(loginName);
             user.setPassword(EncryptUtils.md5(USER_PASSWORD));
-            user.setRole(Role.SUBJECT_HEADER);
+            user.setRole(Role.MARKER);
             user.setSchoolId(schoolId);
             user.setEnable(true);
             user.setCreatedTime(new Date());

stmms-web/src/main/webapp/WEB-INF/views/modules/user/userList.jsp

@@ -72,7 +72,7 @@
              
             <input id="btnImport" class="btn" type="button" value="导入科组长"/>
             &nbsp;
-            <input id="btnImportClass" class="btn" type="button" value="导入用户班级"/>
+            <input id="btnImportClass" class="btn" type="button" value="导入评卷员班级"/>
         </c:if>
     </div>
 </form>