diff --git a/src/main/java/com/jevon/controller/ScheduleInitController.java b/src/main/java/com/jevon/controller/ScheduleInitController.java index 489ea5d..d715e95 100644 --- a/src/main/java/com/jevon/controller/ScheduleInitController.java +++ b/src/main/java/com/jevon/controller/ScheduleInitController.java @@ -236,57 +236,60 @@ public class ScheduleInitController { } courseNumber = j - 1; } else { - if (StringUtils.isBlank(sheetRow.getCell(0).getStringCellValue().trim())) { - continue; - } - String className = sheetRow.getCell(1).getStringCellValue().trim(); - ClassModel classModel = new ClassModel(); - classModel.setSchoolId(schedule.getSchoolId()); - classModel.setClassName(className); - classModel.setGrade(sheetRow.getCell(0).getStringCellValue().trim()); - ClassModel resultClass = classModelService.selectBySchoolIdAndClassNameAndGrade(classModel); - for (int j = 1; j <= courseNumber; j++) { - Cell cell = sheetRow.getCell(2 * j); - if (cell != null) { - cell.setCellType(CellType.STRING); - String times = sheetRow.getCell(2 * j).getStringCellValue().trim(); - if (StringUtils.isNotBlank((times))) { - Course course = courseTeacherMap.get(j); - String teacherName = sheetRow.getCell(2 * j + 1).getStringCellValue().trim(); - Teacher teacher = new Teacher(); - teacher.setTeacherName(teacherName); - teacher.setSchoolId(schedule.getSchoolId()); - Teacher resultTeacher = teacherService.selectByTeacher(teacher); - if (course != null && resultTeacher != null) { - TeacherClass teacherClass = new TeacherClass(); - teacherClass.setTeam(schedule.getTeam()); - teacherClass.setSchoolId(schedule.getSchoolId()); - teacherClass.setCourseName(course.getCourseName()); - teacherClass.setTeacherName(resultTeacher.getTeacherName()); - teacherClass.setTeacherId(resultTeacher.getTeacherId()); - teacherClass.setGrade(sheetRow.getCell(0).getStringCellValue().trim()); - teacherClass.setClassId(resultClass.getClassId()); - String[] msg = times.split("\\+"); - if (msg.length > 1) { - //有联课 - teacherClass.setJoinTimes(Integer.valueOf(msg[1])); - teacherClass.setTimes(Integer.valueOf(msg[1]) * 2 + Integer.valueOf(msg[0])); + if(sheetRow.getCell(0) != null){ + if (StringUtils.isBlank(sheetRow.getCell(0).getStringCellValue().trim())) { + continue; + } + String className = sheetRow.getCell(1).getStringCellValue().trim(); + ClassModel classModel = new ClassModel(); + classModel.setSchoolId(schedule.getSchoolId()); + classModel.setClassName(className); + classModel.setGrade(sheetRow.getCell(0).getStringCellValue().trim()); + ClassModel resultClass = classModelService.selectBySchoolIdAndClassNameAndGrade(classModel); + for (int j = 1; j <= courseNumber; j++) { + Cell cell = sheetRow.getCell(2 * j); + if (cell != null) { + cell.setCellType(CellType.STRING); + String times = sheetRow.getCell(2 * j).getStringCellValue().trim(); + if (StringUtils.isNotBlank((times))) { + Course course = courseTeacherMap.get(j); + String teacherName = sheetRow.getCell(2 * j + 1).getStringCellValue().trim(); + Teacher teacher = new Teacher(); + teacher.setTeacherName(teacherName); + teacher.setSchoolId(schedule.getSchoolId()); + Teacher resultTeacher = teacherService.selectByTeacher(teacher); + if (course != null && resultTeacher != null) { + TeacherClass teacherClass = new TeacherClass(); + teacherClass.setTeam(schedule.getTeam()); + teacherClass.setSchoolId(schedule.getSchoolId()); + teacherClass.setCourseName(course.getCourseName()); + teacherClass.setTeacherName(resultTeacher.getTeacherName()); + teacherClass.setTeacherId(resultTeacher.getTeacherId()); + teacherClass.setGrade(sheetRow.getCell(0).getStringCellValue().trim()); + teacherClass.setClassId(resultClass.getClassId()); + String[] msg = times.split("\\+"); + if (msg.length > 1) { + //有联课 + teacherClass.setJoinTimes(Integer.valueOf(msg[1])); + teacherClass.setTimes(Integer.valueOf(msg[1]) * 2 + Integer.valueOf(msg[0])); + } else { + teacherClass.setJoinTimes(0); + teacherClass.setTimes(Integer.valueOf(msg[0])); + } + teacherClass.setStatus(0); + teacherClass.setCreateTime(date); + teacherClasses.add(teacherClass); } else { - teacherClass.setJoinTimes(0); - teacherClass.setTimes(Integer.valueOf(msg[0])); + baseVo.setMessage("课程或老师缺失"); + baseVo.setSuccess(false); + return baseVo; } - teacherClass.setStatus(0); - teacherClass.setCreateTime(date); - teacherClasses.add(teacherClass); - } else { - baseVo.setMessage("课程或老师缺失"); - baseVo.setSuccess(false); - return baseVo; } - } + } } } + } } teacherClassService.insertBatch(teacherClasses); @@ -297,7 +300,7 @@ public class ScheduleInitController { baseVo.setSuccess(false); } }catch (Exception e){ - System.out.println(e); + e.printStackTrace(); baseVo.setSuccess(false); } return baseVo; diff --git a/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java b/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java index e81b54e..c217682 100644 --- a/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java @@ -32,7 +32,9 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService { result = new ArrayList<>(); } } - analyseDetailMapper.insertBatch(result); + if(result.size() > 0){ + analyseDetailMapper.insertBatch(result); + } return 1 ; } diff --git a/src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java b/src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java index 8c1f82d..6d413bb 100644 --- a/src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java @@ -32,7 +32,9 @@ public class AnalyseDimensionalServiceImpl implements AnalyseDimensionalService result = new ArrayList<>(); } } - analyseDimensionalMapper.insertBatch(result); + if(result.size() > 0){ + analyseDimensionalMapper.insertBatch(result); + } return 1 ; } diff --git a/src/main/java/com/jevon/service/impl/ClassCourseServiceImpl.java b/src/main/java/com/jevon/service/impl/ClassCourseServiceImpl.java index 39a779e..2f9e644 100644 --- a/src/main/java/com/jevon/service/impl/ClassCourseServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/ClassCourseServiceImpl.java @@ -38,7 +38,9 @@ public class ClassCourseServiceImpl implements ClassCourseService { result = new ArrayList<>(); } } - classCourseMapper.insertBatch(result); + if(result.size()>0){ + classCourseMapper.insertBatch(result); + } return 1; } diff --git a/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java b/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java index e839103..82cc432 100644 --- a/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java @@ -32,7 +32,9 @@ public class StudentDetailServiceImpl implements StudentDetailService { result = new ArrayList<>(); } } - studentDetailMapper.insertBatch(result); + if(result.size()>0){ + studentDetailMapper.insertBatch(result); + } return 1 ; } diff --git a/src/main/java/com/jevon/service/impl/StudentServiceImpl.java b/src/main/java/com/jevon/service/impl/StudentServiceImpl.java index 88496df..518ba4f 100644 --- a/src/main/java/com/jevon/service/impl/StudentServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/StudentServiceImpl.java @@ -32,7 +32,9 @@ public class StudentServiceImpl implements StudentService { result = new ArrayList<>(); } } - studentMapper.insertBatch(result); + if(result.size()>0){ + studentMapper.insertBatch(result); + } return 1 ; } diff --git a/src/main/java/com/jevon/service/impl/TeacherClassServiceImpl.java b/src/main/java/com/jevon/service/impl/TeacherClassServiceImpl.java index 5f3468a..08d4cd9 100644 --- a/src/main/java/com/jevon/service/impl/TeacherClassServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/TeacherClassServiceImpl.java @@ -37,7 +37,9 @@ public class TeacherClassServiceImpl implements TeacherClassService { result = new ArrayList<>(); } } - teacherClassMapper.insertBatch(result); + if(result.size()>0){ + teacherClassMapper.insertBatch(result); + } return 1; } diff --git a/src/main/java/com/jevon/service/impl/TeacherCourseServiceImpl.java b/src/main/java/com/jevon/service/impl/TeacherCourseServiceImpl.java index 9ecc8f9..cd077a8 100644 --- a/src/main/java/com/jevon/service/impl/TeacherCourseServiceImpl.java +++ b/src/main/java/com/jevon/service/impl/TeacherCourseServiceImpl.java @@ -31,7 +31,9 @@ public class TeacherCourseServiceImpl implements TeacherCourseService { result = new ArrayList<>(); } } - teacherCourseMapper.insertBatch(result); + if(result.size()>0){ + teacherCourseMapper.insertBatch(result); + } return 1; } -- libgit2 0.21.0