Explorar o código

修复导入复核排序

ting.yin %!s(int64=4) %!d(string=hai) anos
pai
achega
5e7f1ec0cc

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

@@ -3,6 +3,7 @@ package cn.com.qmth.stmms.admin.exam;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -139,7 +140,7 @@ public class ImportQueryController extends BaseExamController {
         try {
             int successNum = 0;
             int failureNum = 0;
-            Set<Integer> successStudent = new HashSet<Integer>();
+            Set<Integer> successStudent = new LinkedHashSet<Integer>();
             Set<String> failureStudent = new HashSet<String>();
             ImportExcel ei = new ImportExcel(file, 1, 0);
             List<InspectedStudentVO> list = ei.getDataList(InspectedStudentVO.class);

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

@@ -168,7 +168,7 @@
             $('#intervalScoreList').val(array.join(','));
             $('#inputForm').submit();
         } else {
-            alert('间隔分不能为空且大于0');
+            alert('间隔分不能为空且大于0.1');
         }
     });
 </script>

+ 1 - 1
stmms-web/src/main/webapp/static/mark-track/js/modules/mark-board.js

@@ -402,7 +402,7 @@ MarkBoard.prototype.updateStepScore = function (step) {
         if (totalScore == undefined) {
             totalScore = 0;
         }
-        totalScore += parseFloat(step.trackList[i].score);
+        totalScore = numberAdd(totalScore,step.trackList[i].score);
     }
     var leftScore = totalScore != undefined ? (step.max - totalScore) : step.max;
     for (var i = 0; i < step.scoreArray.length; i++) {