Commit 1de4a4287acf30888220409153967bfc26c8ae21
1 parent
32666b06
Exists in
master
批量上传bug 修复
Showing
8 changed files
with
70 additions
and
53 deletions
Show diff stats
src/main/java/com/jevon/controller/ScheduleInitController.java
| @@ -236,57 +236,60 @@ public class ScheduleInitController { | @@ -236,57 +236,60 @@ public class ScheduleInitController { | ||
| 236 | } | 236 | } |
| 237 | courseNumber = j - 1; | 237 | courseNumber = j - 1; |
| 238 | } else { | 238 | } else { |
| 239 | - if (StringUtils.isBlank(sheetRow.getCell(0).getStringCellValue().trim())) { | ||
| 240 | - continue; | ||
| 241 | - } | ||
| 242 | - String className = sheetRow.getCell(1).getStringCellValue().trim(); | ||
| 243 | - ClassModel classModel = new ClassModel(); | ||
| 244 | - classModel.setSchoolId(schedule.getSchoolId()); | ||
| 245 | - classModel.setClassName(className); | ||
| 246 | - classModel.setGrade(sheetRow.getCell(0).getStringCellValue().trim()); | ||
| 247 | - ClassModel resultClass = classModelService.selectBySchoolIdAndClassNameAndGrade(classModel); | ||
| 248 | - for (int j = 1; j <= courseNumber; j++) { | ||
| 249 | - Cell cell = sheetRow.getCell(2 * j); | ||
| 250 | - if (cell != null) { | ||
| 251 | - cell.setCellType(CellType.STRING); | ||
| 252 | - String times = sheetRow.getCell(2 * j).getStringCellValue().trim(); | ||
| 253 | - if (StringUtils.isNotBlank((times))) { | ||
| 254 | - Course course = courseTeacherMap.get(j); | ||
| 255 | - String teacherName = sheetRow.getCell(2 * j + 1).getStringCellValue().trim(); | ||
| 256 | - Teacher teacher = new Teacher(); | ||
| 257 | - teacher.setTeacherName(teacherName); | ||
| 258 | - teacher.setSchoolId(schedule.getSchoolId()); | ||
| 259 | - Teacher resultTeacher = teacherService.selectByTeacher(teacher); | ||
| 260 | - if (course != null && resultTeacher != null) { | ||
| 261 | - TeacherClass teacherClass = new TeacherClass(); | ||
| 262 | - teacherClass.setTeam(schedule.getTeam()); | ||
| 263 | - teacherClass.setSchoolId(schedule.getSchoolId()); | ||
| 264 | - teacherClass.setCourseName(course.getCourseName()); | ||
| 265 | - teacherClass.setTeacherName(resultTeacher.getTeacherName()); | ||
| 266 | - teacherClass.setTeacherId(resultTeacher.getTeacherId()); | ||
| 267 | - teacherClass.setGrade(sheetRow.getCell(0).getStringCellValue().trim()); | ||
| 268 | - teacherClass.setClassId(resultClass.getClassId()); | ||
| 269 | - String[] msg = times.split("\\+"); | ||
| 270 | - if (msg.length > 1) { | ||
| 271 | - //有联课 | ||
| 272 | - teacherClass.setJoinTimes(Integer.valueOf(msg[1])); | ||
| 273 | - teacherClass.setTimes(Integer.valueOf(msg[1]) * 2 + Integer.valueOf(msg[0])); | 239 | + if(sheetRow.getCell(0) != null){ |
| 240 | + if (StringUtils.isBlank(sheetRow.getCell(0).getStringCellValue().trim())) { | ||
| 241 | + continue; | ||
| 242 | + } | ||
| 243 | + String className = sheetRow.getCell(1).getStringCellValue().trim(); | ||
| 244 | + ClassModel classModel = new ClassModel(); | ||
| 245 | + classModel.setSchoolId(schedule.getSchoolId()); | ||
| 246 | + classModel.setClassName(className); | ||
| 247 | + classModel.setGrade(sheetRow.getCell(0).getStringCellValue().trim()); | ||
| 248 | + ClassModel resultClass = classModelService.selectBySchoolIdAndClassNameAndGrade(classModel); | ||
| 249 | + for (int j = 1; j <= courseNumber; j++) { | ||
| 250 | + Cell cell = sheetRow.getCell(2 * j); | ||
| 251 | + if (cell != null) { | ||
| 252 | + cell.setCellType(CellType.STRING); | ||
| 253 | + String times = sheetRow.getCell(2 * j).getStringCellValue().trim(); | ||
| 254 | + if (StringUtils.isNotBlank((times))) { | ||
| 255 | + Course course = courseTeacherMap.get(j); | ||
| 256 | + String teacherName = sheetRow.getCell(2 * j + 1).getStringCellValue().trim(); | ||
| 257 | + Teacher teacher = new Teacher(); | ||
| 258 | + teacher.setTeacherName(teacherName); | ||
| 259 | + teacher.setSchoolId(schedule.getSchoolId()); | ||
| 260 | + Teacher resultTeacher = teacherService.selectByTeacher(teacher); | ||
| 261 | + if (course != null && resultTeacher != null) { | ||
| 262 | + TeacherClass teacherClass = new TeacherClass(); | ||
| 263 | + teacherClass.setTeam(schedule.getTeam()); | ||
| 264 | + teacherClass.setSchoolId(schedule.getSchoolId()); | ||
| 265 | + teacherClass.setCourseName(course.getCourseName()); | ||
| 266 | + teacherClass.setTeacherName(resultTeacher.getTeacherName()); | ||
| 267 | + teacherClass.setTeacherId(resultTeacher.getTeacherId()); | ||
| 268 | + teacherClass.setGrade(sheetRow.getCell(0).getStringCellValue().trim()); | ||
| 269 | + teacherClass.setClassId(resultClass.getClassId()); | ||
| 270 | + String[] msg = times.split("\\+"); | ||
| 271 | + if (msg.length > 1) { | ||
| 272 | + //有联课 | ||
| 273 | + teacherClass.setJoinTimes(Integer.valueOf(msg[1])); | ||
| 274 | + teacherClass.setTimes(Integer.valueOf(msg[1]) * 2 + Integer.valueOf(msg[0])); | ||
| 275 | + } else { | ||
| 276 | + teacherClass.setJoinTimes(0); | ||
| 277 | + teacherClass.setTimes(Integer.valueOf(msg[0])); | ||
| 278 | + } | ||
| 279 | + teacherClass.setStatus(0); | ||
| 280 | + teacherClass.setCreateTime(date); | ||
| 281 | + teacherClasses.add(teacherClass); | ||
| 274 | } else { | 282 | } else { |
| 275 | - teacherClass.setJoinTimes(0); | ||
| 276 | - teacherClass.setTimes(Integer.valueOf(msg[0])); | 283 | + baseVo.setMessage("课程或老师缺失"); |
| 284 | + baseVo.setSuccess(false); | ||
| 285 | + return baseVo; | ||
| 277 | } | 286 | } |
| 278 | - teacherClass.setStatus(0); | ||
| 279 | - teacherClass.setCreateTime(date); | ||
| 280 | - teacherClasses.add(teacherClass); | ||
| 281 | - } else { | ||
| 282 | - baseVo.setMessage("课程或老师缺失"); | ||
| 283 | - baseVo.setSuccess(false); | ||
| 284 | - return baseVo; | ||
| 285 | } | 287 | } |
| 286 | - } | ||
| 287 | 288 | ||
| 289 | + } | ||
| 288 | } | 290 | } |
| 289 | } | 291 | } |
| 292 | + | ||
| 290 | } | 293 | } |
| 291 | } | 294 | } |
| 292 | teacherClassService.insertBatch(teacherClasses); | 295 | teacherClassService.insertBatch(teacherClasses); |
| @@ -297,7 +300,7 @@ public class ScheduleInitController { | @@ -297,7 +300,7 @@ public class ScheduleInitController { | ||
| 297 | baseVo.setSuccess(false); | 300 | baseVo.setSuccess(false); |
| 298 | } | 301 | } |
| 299 | }catch (Exception e){ | 302 | }catch (Exception e){ |
| 300 | - System.out.println(e); | 303 | + e.printStackTrace(); |
| 301 | baseVo.setSuccess(false); | 304 | baseVo.setSuccess(false); |
| 302 | } | 305 | } |
| 303 | return baseVo; | 306 | return baseVo; |
src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java
| @@ -32,7 +32,9 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService { | @@ -32,7 +32,9 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService { | ||
| 32 | result = new ArrayList<>(); | 32 | result = new ArrayList<>(); |
| 33 | } | 33 | } |
| 34 | } | 34 | } |
| 35 | - analyseDetailMapper.insertBatch(result); | 35 | + if(result.size() > 0){ |
| 36 | + analyseDetailMapper.insertBatch(result); | ||
| 37 | + } | ||
| 36 | return 1 ; | 38 | return 1 ; |
| 37 | } | 39 | } |
| 38 | 40 |
src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java
| @@ -32,7 +32,9 @@ public class AnalyseDimensionalServiceImpl implements AnalyseDimensionalService | @@ -32,7 +32,9 @@ public class AnalyseDimensionalServiceImpl implements AnalyseDimensionalService | ||
| 32 | result = new ArrayList<>(); | 32 | result = new ArrayList<>(); |
| 33 | } | 33 | } |
| 34 | } | 34 | } |
| 35 | - analyseDimensionalMapper.insertBatch(result); | 35 | + if(result.size() > 0){ |
| 36 | + analyseDimensionalMapper.insertBatch(result); | ||
| 37 | + } | ||
| 36 | return 1 ; | 38 | return 1 ; |
| 37 | } | 39 | } |
| 38 | 40 |
src/main/java/com/jevon/service/impl/ClassCourseServiceImpl.java
| @@ -38,7 +38,9 @@ public class ClassCourseServiceImpl implements ClassCourseService { | @@ -38,7 +38,9 @@ public class ClassCourseServiceImpl implements ClassCourseService { | ||
| 38 | result = new ArrayList<>(); | 38 | result = new ArrayList<>(); |
| 39 | } | 39 | } |
| 40 | } | 40 | } |
| 41 | - classCourseMapper.insertBatch(result); | 41 | + if(result.size()>0){ |
| 42 | + classCourseMapper.insertBatch(result); | ||
| 43 | + } | ||
| 42 | return 1; | 44 | return 1; |
| 43 | } | 45 | } |
| 44 | 46 |
src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java
| @@ -32,7 +32,9 @@ public class StudentDetailServiceImpl implements StudentDetailService { | @@ -32,7 +32,9 @@ public class StudentDetailServiceImpl implements StudentDetailService { | ||
| 32 | result = new ArrayList<>(); | 32 | result = new ArrayList<>(); |
| 33 | } | 33 | } |
| 34 | } | 34 | } |
| 35 | - studentDetailMapper.insertBatch(result); | 35 | + if(result.size()>0){ |
| 36 | + studentDetailMapper.insertBatch(result); | ||
| 37 | + } | ||
| 36 | return 1 ; | 38 | return 1 ; |
| 37 | } | 39 | } |
| 38 | 40 |
src/main/java/com/jevon/service/impl/StudentServiceImpl.java
| @@ -32,7 +32,9 @@ public class StudentServiceImpl implements StudentService { | @@ -32,7 +32,9 @@ public class StudentServiceImpl implements StudentService { | ||
| 32 | result = new ArrayList<>(); | 32 | result = new ArrayList<>(); |
| 33 | } | 33 | } |
| 34 | } | 34 | } |
| 35 | - studentMapper.insertBatch(result); | 35 | + if(result.size()>0){ |
| 36 | + studentMapper.insertBatch(result); | ||
| 37 | + } | ||
| 36 | return 1 ; | 38 | return 1 ; |
| 37 | } | 39 | } |
| 38 | 40 |
src/main/java/com/jevon/service/impl/TeacherClassServiceImpl.java
| @@ -37,7 +37,9 @@ public class TeacherClassServiceImpl implements TeacherClassService { | @@ -37,7 +37,9 @@ public class TeacherClassServiceImpl implements TeacherClassService { | ||
| 37 | result = new ArrayList<>(); | 37 | result = new ArrayList<>(); |
| 38 | } | 38 | } |
| 39 | } | 39 | } |
| 40 | - teacherClassMapper.insertBatch(result); | 40 | + if(result.size()>0){ |
| 41 | + teacherClassMapper.insertBatch(result); | ||
| 42 | + } | ||
| 41 | return 1; | 43 | return 1; |
| 42 | } | 44 | } |
| 43 | 45 |
src/main/java/com/jevon/service/impl/TeacherCourseServiceImpl.java
| @@ -31,7 +31,9 @@ public class TeacherCourseServiceImpl implements TeacherCourseService { | @@ -31,7 +31,9 @@ public class TeacherCourseServiceImpl implements TeacherCourseService { | ||
| 31 | result = new ArrayList<>(); | 31 | result = new ArrayList<>(); |
| 32 | } | 32 | } |
| 33 | } | 33 | } |
| 34 | - teacherCourseMapper.insertBatch(result); | 34 | + if(result.size()>0){ |
| 35 | + teacherCourseMapper.insertBatch(result); | ||
| 36 | + } | ||
| 35 | return 1; | 37 | return 1; |
| 36 | } | 38 | } |
| 37 | 39 |