fixbugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/dao/TrialLibraryDao.java

@@ -44,12 +44,18 @@ public interface TrialLibraryDao extends JpaRepository<TrialLibrary, Integer>, J
     @Query("delete TrialLibrary m where m.studentId=?1")
     void deleteByStudentId(Integer studentId);
 
+    @Query("select l from TrialLibrary l where l.examId=?1 and l.subjectCode=?2 and l.groupNumber=?3 "
+            + "and l.markerId=?4 and l.markerScore!=-1  ")
     List<TrialLibrary> findByExamIdAndSubjectCodeAndGroupNumberAndMarkerId(Integer examId, String subjectCode,
             Integer groupNumber, Integer markerId, Pageable page);
 
+    @Query("select l from TrialLibrary l where l.examId=?1 and l.subjectCode=?2 and l.groupNumber=?3 "
+            + "and l.markerId=?4 and l.secretNumber=?5 and l.markerScore!=-1  ")
     List<TrialLibrary> findByExamIdAndSubjectCodeAndGroupNumberAndMarkerIdAndSecretNumber(Integer examId,
             String subjectCode, Integer groupNumber, Integer markerId, String secretNumber, Pageable query);
 
+    @Query("select l from TrialLibrary l where l.examId=?1 and l.subjectCode=?2 and l.groupNumber=?3 "
+            + "and l.markerId=?4 and l.markerScore=?5 and l.markerScore!=-1  ")
     List<TrialLibrary> findByExamIdAndSubjectCodeAndGroupNumberAndMarkerIdAndMarkerScore(Integer examId,
             String subjectCode, Integer groupNumber, Integer markerId, Double markerScore, Pageable query);
 

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

@@ -173,6 +173,7 @@ public class UserController extends BaseExamController {
                 previous.setPassword(EncryptUtils.md5(password));
             }
             previous.setEnable(user.isEnable());
+            previous.setDescription(user.getDescription());
             String message = validate(previous, subjectCodeString);
             if (message == null) {
                 if (previous.getRole() == Role.SUBJECT_HEADER || user.getRole() == Role.INSPECTOR) {
@@ -180,7 +181,6 @@ public class UserController extends BaseExamController {
                 }
                 if (user.getRole() == Role.COLLEGE_ADMIN) {
                     int examId = getSessionExamId(request);
-                    previous.setDescription(user.getDescription());
                     subjectUserService.updateByUserId(user.getId(),
                             getSubjectCodeSetByCollege(examId, user.getDescription()));
                 }
@@ -255,6 +255,28 @@ public class UserController extends BaseExamController {
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     public String exportFile(UserSearchQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        try {
+            String fileName = "用户数据.xlsx";
+            User user = RequestUtils.getWebUser(request).getUser();
+            query.setSchoolId(user.getSchoolId());
+            query.setPageNumber(1);
+            query.setPageSize(Integer.MAX_VALUE);
+            query = userService.findByQuery(query);
+            for (User s : query.getResult()) {
+                s.setRoleName(s.getRole().getName());
+            }
+            new ExportExcel("用户数据", User.class).setDataList(query.getResult()).write(response, fileName).dispose();
+            return null;
+        } catch (Exception e) {
+            addMessage(redirectAttributes, "导出用户数据失败！" + e.getMessage());
+        }
+        return "redirect:/admin/user/list";
+    }
+
+    @Logging(menu = "导出用户", type = LogType.EXPORT)
+    @RequestMapping(value = "/exportExam", method = RequestMethod.POST)
+    public String exportExam(UserSearchQuery query, HttpServletRequest request, HttpServletResponse response,
+            RedirectAttributes redirectAttributes) {
         try {
             String fileName = "用户数据.xlsx";
             User user = RequestUtils.getWebUser(request).getUser();
@@ -326,12 +348,6 @@ public class UserController extends BaseExamController {
                 new ExportExcel("用户数据", SubjectUserDTO.class).setDataList(list).write(response, fileName).dispose();
                 return null;
             }
-            query = userService.findByQuery(query);
-            for (User s : query.getResult()) {
-                s.setRoleName(s.getRole().getName());
-            }
-            new ExportExcel("用户数据", User.class).setDataList(query.getResult()).write(response, fileName).dispose();
-            return null;
         } catch (Exception e) {
             addMessage(redirectAttributes, "导出用户数据失败！" + e.getMessage());
         }

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

@@ -50,6 +50,7 @@
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
 		<thead>
 			<tr>
+				<th>分组序号</th>
 				<th>评卷员</th>
 				<th>姓名</th>
 				<th>完成任务数</th>
@@ -63,6 +64,7 @@
 		<tbody>
 		<c:forEach items="${query.result}" var="marker">
 			<tr>
+				<td>${marker.groupNumber}</td>
 				<td>${marker.user.loginName}</td>
 				<td>${marker.user.name}</td>
 				<td>${marker.finishCount}</td>

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

@@ -192,7 +192,7 @@ $('.task-btn').click(function () {
             wrongMessage.html('请输入正整数!');
             return false;
         }
-        if (selectivePart > 100 ||selectiveCount > 100) {
+        if (selectivePart > 100 ||selectiveCount > 100 ||selectivePart <= 0 ||selectiveCount <= 0) {
             wrongMessage.html('数量不合法!');
             return false;
         }

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

@@ -292,7 +292,7 @@
     		alert("请选择角色，查询后导出");
     		return false;
     	}
-        $("#exportForm").attr("action", "${ctx}/admin/user/export");
+        $("#exportForm").attr("action", "${ctx}/admin/user/exportExam");
         $("#exportForm").submit();
     }
     $("#ids").change(function () {