1
0
ting.yin 4 жил өмнө
parent
commit
3108588990

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ArbitrateController.java

@@ -223,7 +223,7 @@ public class ArbitrateController extends BaseExamController {
         WebUser wu = RequestUtils.getWebUser(request);
         WebUser wu = RequestUtils.getWebUser(request);
         Direction d = Direction.DESC;
         Direction d = Direction.DESC;
         Sort querySort = null;
         Sort querySort = null;
-        if (sort.equals("asc")) {
+        if (sort.equalsIgnoreCase("ASC")) {
             d = Direction.ASC;
             d = Direction.ASC;
         }
         }
         if (order.equals("markerTime")) {
         if (order.equals("markerTime")) {

+ 2 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

@@ -158,8 +158,9 @@ public class ReportSubjectRangeController extends BaseExamController {
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
             RedirectAttributes redirectAttributes) {
         List<ReportSubjectRangeDTO> list = new ArrayList<ReportSubjectRangeDTO>();
         List<ReportSubjectRangeDTO> list = new ArrayList<ReportSubjectRangeDTO>();
+        int examId = getSessionExamId(request);
         if (StringUtils.isNotBlank(query.getSubjectCode()) && query.getRange() != null) {
         if (StringUtils.isNotBlank(query.getSubjectCode()) && query.getRange() != null) {
-            ReportSubject subject = reportSubjectService.findOne(query.getExamId(), query.getSubjectCode());
+            ReportSubject subject = reportSubjectService.findOne(examId, query.getSubjectCode());
             JSONArray array = getScoreRange(subject.getScoreRange(), subject.getTotalScore(),
             JSONArray array = getScoreRange(subject.getScoreRange(), subject.getTotalScore(),
                     subject.getRealityCount(), query.getRange());
                     subject.getRealityCount(), query.getRange());
             for (int i = 0; i < array.size(); i++) {
             for (int i = 0; i < array.size(); i++) {

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -507,7 +507,7 @@ public class MarkController extends BaseController {
         List<Task> list = new ArrayList<>();
         List<Task> list = new ArrayList<>();
         Direction d = Direction.DESC;
         Direction d = Direction.DESC;
         Sort querySort = null;
         Sort querySort = null;
-        if (sort.equals("ASC")) {
+        if (sort.equalsIgnoreCase("ASC")) {
             d = Direction.ASC;
             d = Direction.ASC;
         }
         }
         if (order.equals("markerTime")) {
         if (order.equals("markerTime")) {

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

@@ -35,7 +35,6 @@
                     $(".doubleDiv").hide();
                     $(".doubleDiv").hide();
                 }
                 }
             });
             });
-            $("#nextDiv").hide();
             $("#btnNext").click(function () {
             $("#btnNext").click(function () {
             	var check_list = []
             	var check_list = []
             	$("input[name='questionIds']:checked").each(function(){
             	$("input[name='questionIds']:checked").each(function(){
@@ -55,8 +54,8 @@
             });
             });
 			$("#btnPre").click(function () {
 			$("#btnPre").click(function () {
             	$("#nextDiv").hide();
             	$("#nextDiv").hide();
-            	$("#nextLi").attr("class","");
 				$("#preDiv").show();
 				$("#preDiv").show();
+            	$("#nextLi").attr("class","");
 				$("#preLi").attr("class","active");
 				$("#preLi").attr("class","active");
             });
             });
         });
         });
@@ -102,7 +101,7 @@
         <a id="btnNext" href="##" class="btn btn-primary">下一步 </a>
         <a id="btnNext" href="##" class="btn btn-primary">下一步 </a>
     </div>
     </div>
 </div>
 </div>
-<div id="nextDiv" >
+<div id="nextDiv" class ="hide">
     <div class="control-group">
     <div class="control-group">
         <label class="control-label">分组号</label>
         <label class="control-label">分组号</label>
         <div class="controls">
         <div class="controls">

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

@@ -47,7 +47,6 @@
                 }
                 }
             });
             });
             
             
-            $("#nextDiv").hide();
             $("#btnNext").click(function () {
             $("#btnNext").click(function () {
             	var check_list = []
             	var check_list = []
             	$("input[name='questionIds']:checked").each(function(){
             	$("input[name='questionIds']:checked").each(function(){
@@ -115,7 +114,7 @@
         <a id="btnNext" href="##" class="btn btn-primary">下一步 </a>
         <a id="btnNext" href="##" class="btn btn-primary">下一步 </a>
     </div>
     </div>
 </div>
 </div>
-<div id="nextDiv">
+<div id="nextDiv" class ="hide">
     <div class="control-group">
     <div class="control-group">
         <label class="control-label">分组序号</label>
         <label class="control-label">分组序号</label>
         <div class="controls">
         <div class="controls">