fixbugs

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

@@ -117,7 +117,7 @@ public class InspectedController extends BaseExamController {
             e.setSubjectiveScoreList(e.getSubjectiveScoreList().replace(UN_SELECTIVE_SCORE, "/"));
             e.setInspectHistoryList(inspectHistoryService.findByStudentIdLimit3(e.getId()));
         }
-        Integer totalCount = inspectedService.countByQuery(query, null, mainNumber, mainStartScore, mainEndScore,
+        Integer totalCount = inspectedService.countByQuery(query, status, mainNumber, mainStartScore, mainEndScore,
                 questionScore, selectiveStatus);
         Integer inspectCount = inspectedService.countByQuery(query, SubjectiveStatus.MARKED, mainNumber,
                 mainStartScore, mainEndScore, questionScore, selectiveStatus);

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

@@ -106,6 +106,9 @@ public class LibraryController extends BaseExamController {
         query.setExamId(examId);
         if (status != null) {
             query.addStatus(status);
+            if (status != LibraryStatus.REJECTED) {
+                query.setRejectReason(null);
+            }
         }
         if (StringUtils.isEmpty(query.getSubjectCode()) && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());

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

@@ -537,8 +537,10 @@ public class PaperController extends BaseExamController {
             old.setMainTitle(question.getMainTitle());
             old.setTotalScore(question.getTotalScore());
             old.setIntervalScore(question.getIntervalScore());
-            old.setScorePolicy(question.getScorePolicy());
+            old.setObjectivePolicy(question.getObjectivePolicy());
             old.setAnswer(question.getAnswer().toUpperCase());
+            old.setPaperType(question.getPaperType());
+            old.setType(question.getType());
             questionService.saveAndFlush(old);
             questionService.updateMainTitle(examId, question.getSubjectCode(), question.isObjective(),
                     question.getMainNumber(), question.getMainTitle());

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

@@ -163,7 +163,7 @@
                 <label class="control-label">原图遮盖</label>
                 <div class="controls">
                     <input name="picList" id="picList" type="hidden"/>
-                    <a href="${ctx}/admin/exam/getSheetConfig" target="_blank" class="required"
+                    <a href="${ctx}/admin/exam/getSheetConfig?examId=${exam.id}" target="_blank" class="required"
                        id="configuration" rel="opener">设置</a>
                 </div>
             </div>