fix bugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamQuestionServiceImpl.java

@@ -79,8 +79,23 @@ public class ExamQuestionServiceImpl extends BaseQueryService<ExamQuestion> impl
     @Override
     public List<ExamQuestion> findByExamAndSubjectAndObjectiveAndPaperType(Integer examId, String subjectCode,
             boolean objective, String paperType) {
-        return questionDao.findByExamIdAndSubjectCodeAndObjectiveAndPaperType(examId, subjectCode, objective,
-                paperType, new Sort(Direction.ASC, "mainNumber", "subNumber"));
+        List<ExamQuestion> list = questionDao.findByExamIdAndSubjectCodeAndObjectiveAndPaperType(examId, subjectCode,
+                objective, paperType, new Sort(Direction.ASC, "mainNumber", "subNumber"));
+        if (objective) {
+            Collections.sort(list, new Comparator<ExamQuestion>() {
+
+                @Override
+                public int compare(ExamQuestion o1, ExamQuestion o2) {
+                    int i = o1.getMainNumber() - o2.getMainNumber();
+                    if (i == 0) {
+                        return Integer.parseUnsignedInt(o1.getSubNumber())
+                                - Integer.parseUnsignedInt(o2.getSubNumber());
+                    }
+                    return i;
+                }
+            });
+        }
+        return list;
     }
 
     @Override

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

@@ -99,8 +99,11 @@ public class ArbitrateHistoryServiceImpl extends BaseQueryService<ArbitrateHisto
                 if (query.getStatus() != null) {
                     predicates.add(cb.equal(root.get("status").as(HistoryStatus.class), query.getStatus()));
                 }
-                return predicates.isEmpty() ? cb.conjunction()
-                        : cb.and(predicates.toArray(new Predicate[predicates.size()]));
+                if (StringUtils.isNotBlank(query.getSecretNumber())) {
+                    predicates.add(cb.equal(root.get("secretNumber"), query.getSecretNumber()));
+                }
+                return predicates.isEmpty() ? cb.conjunction() : cb.and(predicates.toArray(new Predicate[predicates
+                        .size()]));
             }
         };
     }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/thread/ScoreCalculateThread.java

@@ -145,18 +145,6 @@ public class ScoreCalculateThread implements Runnable {
             if (list == null) {
                 list = questionService.findByExamAndSubjectAndObjectiveAndPaperType(examId, subjectCode, true,
                         paperType);
-                Collections.sort(list, new Comparator<ExamQuestion>() {
-
-                    @Override
-                    public int compare(ExamQuestion o1, ExamQuestion o2) {
-                        int i = o1.getMainNumber() - o2.getMainNumber();
-                        if (i == 0) {
-                            return Integer.parseUnsignedInt(o1.getSubNumber())
-                                    - Integer.parseUnsignedInt(o2.getSubNumber());
-                        }
-                        return i;
-                    }
-                });
                 objectiveMap.put(key, list);
             }
             return list;

stmms-web/src/main/java/cn/com/qmth/stmms/admin/thread/ScoreReportThread.java

@@ -137,18 +137,6 @@ public class ScoreReportThread implements Runnable {
             if (list == null) {
                 list = questionService.findByExamAndSubjectAndObjectiveAndPaperType(examId, subjectCode, true,
                         paperType);
-                Collections.sort(list, new Comparator<ExamQuestion>() {
-
-                    @Override
-                    public int compare(ExamQuestion o1, ExamQuestion o2) {
-                        int i = o1.getMainNumber() - o2.getMainNumber();
-                        if (i == 0) {
-                            return Integer.parseUnsignedInt(o1.getSubNumber())
-                                    - Integer.parseUnsignedInt(o2.getSubNumber());
-                        }
-                        return i;
-                    }
-                });
                 objectiveMap.put(key, list);
             }
             return list;

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

@@ -74,34 +74,30 @@
     <form:hidden path="subjectCode"/>
     <input type="hidden" id="questionDetail" name="questionDetail"/>
 <div id="preDiv">
-	<div class="control-group">
-        <label class="control-label">课程</label>
-        <div class="controls">
-		${subject.code }-${subject.name }
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">主观题分</label>
-        <div class="controls">
-		${subject.subjectiveScore }分
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">主观题</label>
-        <div class="controls">
+	<div>
         <table id="contentTable" class="table table-striped table-bordered table-condensed">
+        <caption><h4>${subject.code }-${subject.name } 主观题${subject.subjectiveScore }分</h4></caption>
+        	<thead>
+        	<tr>
+        		 <th>名称</th>
+       			 <th>大题号</th>
+        		 <th>小题号</th>
+        		 <th>分数</th>
+        		 <th></th>
+			</tr>
+        	</thead>
 			<c:forEach items="${questionList}" var="item">
 		    <tr>
-		    <td>${item.mainNumber }-${item.subNumber }</td>
+		    <td>${item.mainNumber }</td>
+		    <td>${item.subNumber }</td>
 			<td>${item.mainTitle }</td>
-			<td>${item.totalScore}分</td>
+			<td><fmt:formatNumber pattern="###.#" value="${item.totalScore}"/></td>
 			<td><input type="checkbox" name="questionIds" value="${item.id }" <c:if test="${item.groupNumber!=null}"> disabled="disabled"</c:if>></td>
 			</tr>
 			</c:forEach>
 		</table>
-    	</div>
-    </div>
-    <div class="form-actions">
+	</div>
+    <div class="pull-right">
         <a href="${ctx}/admin/exam/group?subjectCode=${group.subjectCode}" class="btn">取&nbsp;消</a>&nbsp;&nbsp;
         <a id="btnNext" href="##" class="btn btn-primary">下一步 </a>
     </div>

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

@@ -87,34 +87,30 @@
     <input type="hidden" id="rest" name="reset" value="true"/>
     <input type="hidden" id="number" name="number" value="${group.number }"/>
 <div id="preDiv">
-	<div class="control-group">
-        <label class="control-label">课程</label>
-        <div class="controls">
-		${subject.code }-${subject.name }
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">主观题分</label>
-        <div class="controls">
-		${subject.subjectiveScore }分
-        </div>
-    </div>
-    <div class="control-group">
-        <label class="control-label">主观题</label>
-        <div class="controls">
+	<div>
         <table id="contentTable" class="table table-striped table-bordered table-condensed">
+			<caption><h4>${subject.code }-${subject.name } 主观题${subject.subjectiveScore }分</h4></caption>
+        	<thead>
+        	<tr>
+        		 <th>名称</th>
+       			 <th>大题号</th>
+        		 <th>小题号</th>
+        		 <th>分数</th>
+        		 <th></th>
+			</tr>
+        	</thead>
 			<c:forEach items="${questionList}" var="item">
 		    <tr>
-		    <td>${item.mainNumber }-${item.subNumber }</td>
+		    <td>${item.mainNumber }</td>
+		    <td>${item.subNumber }</td>
 			<td>${item.mainTitle }</td>
-			<td>${item.totalScore}分</td>
+			<td><fmt:formatNumber pattern="###.#" value="${item.totalScore}"/></td>
 			<td><input type="checkbox" name="questionIds" value="${item.id }" <c:if test="${item.groupNumber!=null && item.groupNumber!=group.number}"> disabled="disabled"</c:if> <c:if test="${item.groupNumber==group.number}"> checked</c:if>></td>
 			</tr>
 			</c:forEach>
 		</table>
-    	</div>
     </div>
-    <div class="form-actions">
+    <div class="pull-right">
         <a href="${ctx}/admin/exam/group?subjectCode=${group.subjectCode}" class="btn">取&nbsp;消</a>&nbsp;&nbsp;
         <a id="btnNext" href="##" class="btn btn-primary">下一步 </a>
     </div>
@@ -224,7 +220,7 @@
     </div>
     <div class="form-actions">
         <a id="btnSubmit" href="##" class="btn btn-primary">保 存</a>&nbsp;
-        <a href="${ctx}/admin/exam/group/delete?subjectCode=${group.subjectCode}&number=${group.number}" data-number="${group.number}" class="delete-button btn btn-danger">删除</a>
+        <a href="${ctx}/admin/exam/group/delete?subjectCode=${group.subjectCode}&number=${group.number}" data-number="${group.number}" class="delete-button btn btn-danger">删除</a>&nbsp;
         <a id="btnPre" class="btn">上一步</a>
     </div>
 </div>

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

@@ -66,6 +66,12 @@
     <input type="hidden" id="rest" name="reset" value="false"/>
     <input type="hidden" id="intervalScoreList" name="intervalScoreList" value=""/>
     
+	<div class="control-group">
+        <label class="control-label">分组序号</label>
+        <div class="controls">
+            <form:input path="number" htmlEscape="false" class="required" readonly="true"/>
+        </div>
+    </div>
     <div class="control-group">
         <label class="control-label">名称</label>
         <div class="controls">