fixbugs

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

@@ -59,12 +59,14 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
 
     @Override
     public long countByExamAndSubjectAndGroupAndStatus(int examId, String subjectCode, int groupNumber,
-            LibraryStatus status) {
+            LibraryStatus... status) {
         MarkLibrarySearchQuery query = new MarkLibrarySearchQuery();
         query.setExamId(examId);
         query.setSubjectCode(subjectCode);
         query.setGroupNumber(groupNumber);
-        query.addStatus(status);
+        for (LibraryStatus libraryStatus : status) {
+            query.addStatus(libraryStatus);
+        }
         return countByQuery(query);
     }
 

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

@@ -27,6 +27,7 @@ import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroupStudent;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
 import cn.com.qmth.stmms.biz.exam.model.SubjectiveScore;
+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;
@@ -123,6 +124,9 @@ public class MarkServiceImpl implements MarkService {
     @Autowired
     private ExamService examService;
 
+    @Autowired
+    private ExamQuestionService questionService;
+
     private Map<Integer, Long> markerLastUpdateTime = new ConcurrentHashMap<>();
 
     /**
@@ -1501,8 +1505,9 @@ public class MarkServiceImpl implements MarkService {
                     }
                 }
             }
+
             subjectService.updateScore(examId, subjectCode, objective,
-                    questionDao.sumTotalScore(examId, subjectCode, objective));
+                    questionService.sumTotalScore(examId, subjectCode, objective));
 
             return true;
         }

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

@@ -374,9 +374,9 @@ public class TaskServiceImpl implements TaskService {
                 step.setScore(sItems.get(i).getScore());
             }
             // 增加阅卷轨迹列表获取
-            MarkGroup group = groupService.findOne(student.getExamId(), student.getSubjectCode(),
+            List<MarkLibrary> libraryList = libraryService.findByStudentAndGroup(student.getId(),
                     question.getGroupNumber());
-            if (group.getDoubleRate() == null || group.getDoubleRate() == 0) {
+            if (libraryList.size() == 1) {
                 List<MarkTrack> tracks = trackService.findByStudentId(student.getId());
                 String questionNumber = question.getQuestionNumber();
                 for (MarkTrack track : tracks) {

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

@@ -20,7 +20,8 @@ public interface MarkLibraryService {
     List<MarkLibrary> findUnMarked(Integer examId, String subjectCode, Integer groupNumber, Integer markerId,
             Integer userId, boolean filterClass, int pageNumber, int pageSize, Set<LibraryStatus> statusSet);
 
-    long countByExamAndSubjectAndGroupAndStatus(int examId, String subjectCode, int groupNumber, LibraryStatus status);
+    long countByExamAndSubjectAndGroupAndStatus(int examId, String subjectCode, int groupNumber,
+            LibraryStatus... status);
 
     long countByMarker(int markerId);
 

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

@@ -19,8 +19,8 @@
     </c:if>
 </ul>
 <form id="searchForm" action="${ctx}/admin/exam/list" method="post" class="breadcrumb form-search">
-    <input id="pageNumber" name="pageNumber" type="hidden"/>
-    <input id="pageSize" name="pageSize" type="hidden"/>
+    <input type="hidden" id="pageNumber" name="pageNumber" value="${query.pageNumber }"/>
+    <input type="hidden" id="pageSize" name="pageSize" value="${query.pageSize }"/>
     <div>
         <label>名称</label>
         <input type="text" id="name" name="name" value="${query.name}" htmlEscape="false" maxlength="20" class="input-medium"/>

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

@@ -48,7 +48,7 @@
                 }
             });
             
-            $("#preDiv").hide();
+            $("#nextDiv").hide();
             $("#btnNext").click(function () {
             	var check_list = []
             	$("input[name='questionIds']:checked").each(function(){
@@ -77,8 +77,8 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li id="preLi"><a>勾选试题分组</a></li>
-    <li class="active" id="nextLi"><a>分组参数设置</a></li>
+    <li class="active"  id="preLi"><a>勾选试题分组</a></li>
+    <li id="nextLi"><a>分组参数设置</a></li>
 </ul>
 <br/>
 <form:form id="inputForm" modelAttribute="group" action="${ctx}/admin/exam/group/update" method="post"

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

@@ -103,7 +103,7 @@
     <form:input path="picList" class="required" id="picList" type="hidden"/>
     <c:forEach items="${questions}" var="question">
         <div class="control-group">
-            <label class="control-label">小题${question.subNumber}间隔分</label>
+            <label class="control-label">${question.mainNumber}-${question.subNumber}间隔分</label>
             <div class="controls">
                 <input type="text" class="required interval-score-input" htmlEscape="false" maxlength="10"
                        value="${question.intervalScore}"/>

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

@@ -158,6 +158,16 @@
         }
     });
     
+    $(".groupNumbers").change(function () {
+    	var all = true;
+    	$("input[name='groupNumbers']").each(function(){
+    		if(!$(this).is(':checked')){
+    			all = false;
+    		}
+    	})
+		 $("#groupNumbers").attr("checked", all);
+    });
+    
     function goFinish() {
     	var check_list = []
     	$("input[name='groupNumbers']:checked").each(function(){

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

@@ -83,12 +83,14 @@
 <script type="text/javascript">
 function page(n,s){
 	$("#pageNumber").val(n);
+	$("#pageSize").val(s);
 	$("#searchForm").attr('action', '${ctx}/admin/exam/mark');
 	$("#searchForm").submit();
 	return false;
 }
 function goSearch(){
 	$("#pageNumber").val(1);
+	$("#pageSize").val('${query.pageSize}');
 	$("#searchForm").attr('action', '${ctx}/admin/exam/mark');
 	$("#searchForm").submit();
 	return false;
@@ -107,7 +109,6 @@ var markedCount =${markedCount};
 var unMarkedCount =${unMarkedCount};
 var finishCount =${finishCount};
 var unFinishCount =${unFinishCount};
-debugger;
 var myChart = echarts.init(document.getElementById('main'));
 myChart.setOption({
 	title: [{

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

@@ -86,7 +86,7 @@
                     <a class="json-link" href="${ctx}/admin/exam/library/getJson?studentId=${result.id}&groupNumber=${result.number}" target="_blank">原图</a>
                 </c:if>
                 <c:if test="${examType!='MULTI_MEDIA'}">
-                    <a class="track-link" href="#" data-image-url="${ctx}/admin/exam/track/byLibrary?libraryId=${result.libraryId}" data-title="${result.secretNumber}">试卷详情</a>
+                  	<a href="${ctx}/web/admin/exam/track/library?libraryId=${result.id}" target="_blank">轨迹图</a>
                 </c:if>
                 &nbsp;
                 <a href="##" data-id="${result.libraryId}" class="back-link">打回</a>
@@ -148,6 +148,7 @@
 
     function page(n, s) {
         $("#pageNumber").val(n);
+        $("#pageSize").val(s);
         $("#searchForm").attr('action', '${ctx}/admin/exam/problem/history');
         $("#searchForm").submit();
         return false;
@@ -155,6 +156,7 @@
 
     function goSearch() {
         $("#pageNumber").val(1);
+        $("#pageSize").val('${query.pageSize}');
         $("#searchForm").attr('action', '${ctx}/admin/exam/problem/history');
         $("#searchForm").submit();
         return false;

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubject.jsp

@@ -73,12 +73,12 @@ $("#export-button").click(function(){
 	$("#searchForm").submit();
 });
 
-function page(n,s){
-	$("#pageNumber").val(n);
-	$("#pageSize").val(s);
-	$("#searchForm").attr("action","${ctx}/admin/exam/reportSubject");
-	$("#searchForm").submit();
-	return false;
+function page(n, s) {
+    $("#pageNumber").val(n);
+    $("#pageSize").val(s);
+    $("#searchForm").attr('action', '{ctx}/admin/exam/reportSubject/export');
+    $("#searchForm").submit();
+    return false;
 }
 function goSearch(){
 	$("#pageNumber").val(1);