fix bugs

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

@@ -361,6 +361,7 @@ public class PaperController extends BaseExamController {
                                                 + question.getSubNumber() + "已有选做题分组");
                                         continue;
                                     }
+                                    old.setName(question.getName());
                                     old.setTotalScore(question.getTotalScore());
                                     old.setIntervalScore(question.getIntervalScore());
                                     questionService.save(old);

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

@@ -78,13 +78,14 @@ public class RejectController extends BaseExamController {
         query.addStatus(LibraryStatus.REJECTED);
         query = libraryService.findByQuery(query);
         for (MarkLibrary library : query.getResult()) {
+            if (library.getMarkerId() != null) {
+                Marker marker = markerService.findById(library.getMarkerId());
+                User user = userService.findById(marker.getUserId());
+                library.setMarkerLoginName(user.getLoginName() + "/" + user.getName());
+            }
             RejectHistory h = historyService.findLastByLibraryId(library.getId());
-            Marker marker = markerService.findById(h.getMarkerId());
-            User user = userService.findById(marker.getUserId());
-            library.setMarkerLoginName(user.getLoginName() + "/" + user.getName());
             User header = userService.findById(h.getUserId());
             library.setHeaderLoginName(header.getLoginName() + "/" + header.getName());
-            library.setMarkerScoreList(h.getScoreList());
             library.setSubject(subjectService.find(examId, library.getSubjectCode()));
             MarkGroup group = groupService.findOne(examId, library.getSubjectCode(), library.getGroupNumber());
             group.setQuestionList(questionService.findByExamAndSubjectAndObjectiveAndGroupNumber(examId,

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

@@ -28,7 +28,7 @@
         </select>
         <label>分组</label>
         <select class="input-medium" id="group-select" name="groupNumber">
-            <option value="0">请选择</option>
+            <option value="">请选择</option>
             <c:forEach items="${groupList}" var="item">
                 <option value="${item.number}" <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
             </c:forEach>
@@ -94,7 +94,11 @@
             <td>${result.markerLoginName}</td>
             <td>${result.markerScoreList}</td>
             <td>${result.headerLoginName}</td>
-            <td>${result.headerTime}</td>
+            <td>
+            	<c:if test="${result.headerTime!=null}">
+	                    <fmt:formatDate value="${result.headerTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+	            </c:if>
+            </td>
             <td>
                	<a href="${ctx}/web/admin/exam/track/library?libraryId=${result.id}&subjectCode=${result.subjectCode}" target="_blank">试卷详情</a>
             </td>