新增清空选做题分组设计，修复打回到待评池

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

@@ -1515,9 +1515,8 @@ public class MarkServiceImpl implements MarkService {
                 }
                 if (library.getStatus().equals(LibraryStatus.ARBITRATED) || qList.size() == questions.size()) {
                     // 仲裁任务直接重置 或者该分组下所有分数被打回也重置
-                    libraryDao.resetById(library.getId(), library.getMarkerId(), LibraryStatus.REJECTED,
-                            LibraryStatus.MARKED, LibraryStatus.PROBLEM, LibraryStatus.INSPECTED,
-                            LibraryStatus.ARBITRATED);
+                    libraryDao.resetById(library.getId(), null, LibraryStatus.REJECTED, LibraryStatus.MARKED,
+                            LibraryStatus.PROBLEM, LibraryStatus.INSPECTED, LibraryStatus.ARBITRATED);
                     trackDao.deleteByLibraryId(library.getId());
                     specialTagDao.deleteByLibraryId(library.getId());
                     arbitrateDao.deleteByStudentIdAndGroupNumber(student.getId(), groupNumber);
@@ -1643,7 +1642,7 @@ public class MarkServiceImpl implements MarkService {
                 markerScoreList.append(",");
             }
         }
-        if (libraryDao.updateMarkerResult(library.getId(), LibraryStatus.REJECTED, library.getMarkerId(), null,
+        if (libraryDao.updateMarkerResult(library.getId(), LibraryStatus.REJECTED, null, null,
                 markerScoreList.toString(), null, null, LibraryStatus.MARKED) == 1) {
             resetStudentGroup(library.getStudentId(), library.getExamId(), library.getSubjectCode(),
                     library.getGroupNumber());

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

@@ -120,4 +120,19 @@ public class SelectiveGroupController extends BaseExamController {
         }
         return true;
     }
+
+    @Logging(menu = "清空选做题设置", type = LogType.ADD)
+    @RequestMapping("/clear")
+    @Transactional
+    public String claer(HttpServletRequest request, RedirectAttributes redirectAttributes,
+            @RequestParam String subjectCode) {
+        int examId = getSessionExamId(request);
+        List<MarkGroup> groups = groupService.findByExamAndSubject(examId, subjectCode);
+        if (groups != null && groups.size() > 0) {
+            addMessage(redirectAttributes, "该科目已经存在分组，无法设置");
+            return "redirect:/admin/exam/paper";
+        }
+        selectiveGroupService.deleteByExamIdAndSubjectCode(examId, subjectCode);
+        return "redirect:/admin/exam/paper";
+    }
 }

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

@@ -160,7 +160,6 @@
                                     <c:if test="${web_user.schoolViewer==true}">
                                         <li><a href="${ctx}/admin/exam/score" target="mainFrame"><i class="icon-search"></i><span data-i18n-text="index.score">成绩查询</span></a></li>
                                     	<li><a href="${ctx}/admin/exam/reportSubject" target="mainFrame"><i class="icon-signal"></i><span data-i18n-text="index.report.total">总量分析</span></a></li>
-                                        <li><a href="${ctx}/admin/exam/reportSubjectRange" target="mainFrame"><i class="icon-asterisk"></i><span data-i18n-text="index.report.subject">科目分析</span></a></li>
                                       	<li><a href="${ctx}/admin/operation/log" target="mainFrame"><i class="icon-tasks"></i><span data-i18n-text="index.log">操作日志</span></a></li>
                                     </c:if>
                                     

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

@@ -62,7 +62,7 @@
 				</td>
 				<td>
 					<c:if test="${question.objective}"><a href="${ctx}/admin/exam/paper/question-edit/${question.id}">编辑</a></c:if>
-					<c:if test="${question.groupNumber==null ||question.groupNumber==0}"><a href="${ctx}/admin/exam/paper/question-delete/${question.id}">删除</a></c:if>
+					<c:if test="${question.groupNumber==null ||question.groupNumber==0}"><a href="${ctx}/admin/exam/paper/question-delete/${question.id}" class="delete-button">删除</a></c:if>
 				</td>
 			</tr>
 		</c:forEach>
@@ -72,6 +72,9 @@
 $('#type-select').change(function(){
 	$('#searchForm').submit();
 });
+$('.delete-button').click(function () {
+    return confirm('确定要删除吗？');
+});
 </script>	
 </body>
 </html>

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

@@ -18,10 +18,13 @@
 			<label>试卷总分：${subject.totalScore}</label>
 			&nbsp;		
 			<a class="btn" href="${ctx}/admin/exam/paper">返回</a>
+			&nbsp;
+			<a href="${ctx}/admin/exam/selectiveGroup/clear?subjectCode=${subject.code}" class="delete-button">清空选做题分组设置</a>
 		</div>
 		<div>
 		<label>合分数量：</label><input name="selectiveCount" min="1" class="digits" type="number" id="selectiveCount" value="${selectiveCount }"/> 
 		<a id="btnSubmit" href="##" class="btn btn-primary">确定</a>
+		
 		</div>
 		<br/>
 	<tags:message content="${message}"/>
@@ -69,6 +72,9 @@ $('#btnSubmit').click(function () {
 	}
    $('#inputForm').submit();
 });
+$('.delete-button').click(function () {
+    return confirm('确定要清空吗？');
+});
 </script>	
 </body>
 </html>