Merge remote-tracking branch 'origin/dev_1.3.8' into dev_1.3.8

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TrialServiceImpl.java

@@ -156,4 +156,9 @@ public class TrialServiceImpl extends BaseQueryService<TrialLibrary> implements
     public List<TrialTag> findTagByStudentId(Integer studentId) {
         return tagDao.findByStudentIdOrderByIdAsc(studentId);
     }
+
+    @Override
+    public long countMarkedLibrary(Integer examId, String subjectCode, Integer groupNumber) {
+        return libraryDao.countMarked(examId, subjectCode, groupNumber);
+    }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/TrialService.java

@@ -36,4 +36,6 @@ public interface TrialService {
     List<TrialLibrary> findHistory(Integer examId, String subjectCode, Integer groupNumber, Integer markerId,
             String secretNumber, int pageNumber, int pageSize, Sort querySort);
 
+    long countMarkedLibrary(Integer examId, String subjectCode, Integer groupNumber);
+
 }

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

@@ -413,6 +413,12 @@ public class PaperController extends BaseExamController {
                         error.add("[" + subject.getCode() + "] 已存在分组");
                         continue;
                     }
+                    long selectiveGroupCount = selectiveGroupService.countByExamIdAndSubjectCode(examId,
+                            subject.getCode());
+                    if (selectiveGroupCount > 0) {
+                        error.add("[" + subject.getCode() + "] 已存在选做题分组");
+                        continue;
+                    }
                     Map<Integer, String> titleMap = new HashMap<>();
                     List<ExamQuestion> current = questionService.findByExamAndSubjectAndObjective(examId,
                             subject.getCode(), false);

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

@@ -177,7 +177,8 @@ public class StudentController extends BaseExamController {
                     // groupService.resetBuildTime(examId,
                     // previous.getSubjectCode());
                     // }
-                    addMessage(redirectAttributes, "考生" + previous.getName() + "保存成功");
+                    // addMessage(redirectAttributes, "考生" + previous.getName()
+                    // + "保存成功");
                 } else {
                     addMessage(redirectAttributes, "考生不存在");
                 }

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

@@ -135,7 +135,8 @@ public class UserController extends BaseExamController {
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @RoleRequire(Role.SCHOOL_ADMIN)
     public String save(HttpServletRequest request, Model model, User user,
-            @RequestParam(required = false) String subjectCodeString, UserSearchQuery query,
+            @RequestParam(required = false) String subjectCodeString,
+            @RequestParam(required = false, defaultValue = "1") int pageNumber,
             @RequestParam(required = false) UserSource querySource, @RequestParam(required = false) Role queryRole,
             @RequestParam(required = false) String queryLoginName, @RequestParam(required = false) String queryName,
             @RequestParam(required = false) Boolean queryEnable) {
@@ -197,6 +198,8 @@ public class UserController extends BaseExamController {
                 model.addAttribute("user", previous);
                 model.addAttribute("roleList", ROLE_LIST);
                 model.addAttribute("message", message);
+                UserSearchQuery query = new UserSearchQuery();
+                query.setPageNumber(pageNumber);
                 query.setSource(querySource);
                 query.setRole(queryRole);
                 query.setLoginName(queryLoginName);
@@ -209,7 +212,7 @@ public class UserController extends BaseExamController {
         String enable = queryEnable == null ? "" : queryEnable.toString();
         String role = queryRole == null ? "" : String.valueOf(queryRole.getValue());
         String source = querySource == null ? "" : String.valueOf(querySource.getValue());
-        return "redirect:/admin/user/list?pageNumber=" + query.getPageNumber() + "&source=" + source + "&role=" + role
+        return "redirect:/admin/user/list?pageNumber=" + pageNumber + "&source=" + source + "&role=" + role
                 + "&loginName=" + queryLoginName + "&name=" + queryName + "&enable=" + enable;
     }
 

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

@@ -394,7 +394,7 @@ public class MarkController extends BaseController {
         } else if (group.getStatus() == MarkStatus.TRIAL) {
             totalCount = trialService.countLibrary(group.getExamId(), group.getSubjectCode(), group.getNumber());
             personCount = trialService.countByMarkerId(marker.getId());
-            markedCount = personCount;
+            markedCount = trialService.countMarkedLibrary(group.getExamId(), group.getSubjectCode(), group.getNumber());
         }
         status.accumulate("personCount", personCount);
         status.accumulate("totalCount", totalCount);
@@ -421,11 +421,7 @@ public class MarkController extends BaseController {
                     group.getSubjectCode(), false, group.getNumber()));
             json.accumulate("title", group.getTitle());
             json.accumulate("totalCount", group.getLibraryCount());
-            if (group.getStatus() == MarkStatus.TRIAL) {
-                json.accumulate("markedCount", trialService.countByMarkerId(m.getId()));
-            } else {
-                json.accumulate("markedCount", group.getMarkedCount());
-            }
+            json.accumulate("markedCount", group.getMarkedCount());
             array.add(json);
         }
         return array;

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

@@ -71,8 +71,6 @@
 <script type="text/javascript">
     $(document).ready(function () {
         //$("#name").focus();
-        var studentQuery =localStorage.getItem("studentQuery");
-        $("#studentQuery").attr("value",studentQuery);
         $("#inputForm").validate({
 
             submitHandler: function (form) {

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

@@ -253,7 +253,7 @@
             <td>${student.examRoom}</td>
             <td>
                 <c:if test="${web_user.schoolAdmin==true}">
-                    <a href="${ctx}/admin/exam/student/update?id=${student.id}" id="update-btn">修改</a>
+                    <a href="${ctx}/admin/exam/student/update?id=${student.id}" class="update-btn">修改</a>
                     <c:if test="${examType!='MULTI_MEDIA'}">
                         &nbsp;
                         <a href="${ctx}/admin/exam/student/delete?id=${student.id}" onclick="return confirmx('确认要删除该考生吗？', this.href)">删除</a>
@@ -382,16 +382,7 @@
         });
     }
     
-    $('#update-btn').click(function () {
-    	 var studentQuery = [];
-    	 $('.studentQuery').each(function (i) {
-    		   // var val = $(this).attr("value");
-    		   // if(val!="" && val!=null && val!=undefined){
-    		    	/* var key= $(this).attr("name");
-    		    	var query={key:val};
-    		    	studentQuery.push(query); */
-    		   // }
-    		});
+    $('.update-btn').click(function () {
     	localStorage.setItem("studentQuery", JSON.stringify($("#searchForm").serializeArray()));
     });
 </script>