导入BUG修复

themis-business/src/main/java/com/qmth/themis/business/templete/TaskImportCommon.java

@@ -159,14 +159,13 @@ public class TaskImportCommon {
      * 异常处理
      *
      * @param min
-     * @param y
      * @param e
      * @param txtList
      * @return
      */
-    public List<String> exception(int min, int y, Exception e, List<String> txtList) {
+    public List<String> exception(int min, Exception e, List<String> txtList) {
         this.exception = true;
-        String exceptionStr = "数据处理到第" + (y == 0 ? y + 1 : y) + "条时发生异常，请联系系统管理员处理！";
+        String exceptionStr = "数据处理到第" + (min == 0 ? min + 1 : min) + "条时发生异常，请联系系统管理员处理！";
         txtList.add(DateUtil.format(new Date(), this.timeFormat) + "->" + exceptionStr);
         this.tbTaskHistory.setSummary(exceptionStr);
         this.tbTaskHistory.setStatus(TaskStatusEnum.FINISH);

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamStudentImportTemplete.java

@@ -116,8 +116,7 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
         } catch (Exception e) {
             log.error("导入报错", e);
             int min = Objects.isNull(map.get("min")) ? 0 : Integer.parseInt(String.valueOf(map.get("min")));
-            int y = Objects.isNull(map.get("y")) ? 0 : Integer.parseInt(String.valueOf(map.get("y")));
-            taskImportCommon.exception(min, y, e, taskImportCommon.getTxtList());
+            taskImportCommon.exception(min, e, taskImportCommon.getTxtList());
         } finally {
             //这里写入txt文件
             taskImportCommon.writeImportResultTxt(taskImportCommon.getTxtList().toString(), file);

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskRoomCodeImportTemplete.java

@@ -96,8 +96,7 @@ public class TaskRoomCodeImportTemplete implements TaskImportTemplete {
         } catch (Exception e) {
             log.error("导入报错", e);
             int min = Objects.isNull(map.get("min")) ? 0 : Integer.parseInt(String.valueOf(map.get("min")));
-            int y = Objects.isNull(map.get("y")) ? 0 : Integer.parseInt(String.valueOf(map.get("y")));
-            taskImportCommon.exception(min, y, e, taskImportCommon.getTxtList());
+            taskImportCommon.exception(min, e, taskImportCommon.getTxtList());
         } finally {
             //这里写入txt文件
             taskImportCommon.writeImportResultTxt(taskImportCommon.getTxtList().toString(), file);

themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -108,14 +108,13 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
             LinkedMultiValueMap<Integer, Object> finalMap = finalList.get(i);
             List<Object> examStudentImportDtoList = finalMap.get(i);
             int min = 0;
-            int y = 0;
             int max = SystemConstant.MAX_IMPORT_SIZE, size = examStudentImportDtoList.size();
             if (max >= size) {
                 max = size;
             }
             while (max <= size) {
                 List subList = examStudentImportDtoList.subList(min, max);
-                for (; y < subList.size(); y++) {
+                for (int y = 0; y < subList.size(); y++) {
                     ExamStudentImportDto examStudentImportDto = (ExamStudentImportDto) subList.get(y);
                     if (Objects.equals(modeEnum, ExamModeEnum.TOGETHER)) {
                         Map m = (Map) teExamActivityMap.get(examStudentImportDto.getExamActivityCode());
@@ -187,7 +186,6 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                 }
                 txtList = this.importProgress(max, min, size, txtList, tbTaskHistory, timeFormat);
                 map.put("min", min);
-                map.put("y", y);
                 if (max == size) {
                     break;
                 }
@@ -242,14 +240,13 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
             LinkedMultiValueMap<Integer, Object> finalMap = finalList.get(i);
             List<Object> examStudentDtoImportList = finalMap.get(i);
             int min = 0;
-            int y = 0;
             int max = SystemConstant.MAX_IMPORT_SIZE, size = examStudentDtoImportList.size();
             if (max >= size) {
                 max = size;
             }
             while (max <= size) {
                 List subList = examStudentDtoImportList.subList(min, max);
-                for (; y < subList.size(); y++) {
+                for (int y = 0; y < subList.size(); y++) {
                     RoomCodeImportDto roomCodeImportDto = (RoomCodeImportDto) subList.get(y);
                     dataVerify(examId, roomCodeImportDto.getTeacher1(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId);
                     dataVerify(examId, roomCodeImportDto.getTeacher2(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId);