批量上传bug 修复

陈杰
1 parent 32666b06
Showing 8 changed files with 70 additions and 53 deletions Show diff stats
src/main/java/com/jevon/controller/ScheduleInitController.java
src/main/java/com/jevon/service/impl/AnalyseDetailServiceImpl.java
src/main/java/com/jevon/service/impl/AnalyseDimensionalServiceImpl.java
src/main/java/com/jevon/service/impl/ClassCourseServiceImpl.java
src/main/java/com/jevon/service/impl/StudentDetailServiceImpl.java
src/main/java/com/jevon/service/impl/StudentServiceImpl.java
src/main/java/com/jevon/service/impl/TeacherClassServiceImpl.java
src/main/java/com/jevon/service/impl/TeacherCourseServiceImpl.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;
@@ -32,7 +32,9 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService {
                 result = new ArrayList<>();
             }
         }
-        analyseDetailMapper.insertBatch(result);
+        if(result.size() > 0){
+            analyseDetailMapper.insertBatch(result);
+        }
         return  1 ;
     }
  
@@ -32,7 +32,9 @@ public class AnalyseDimensionalServiceImpl implements AnalyseDimensionalService 
                 result = new ArrayList<>();
             }
         }
-        analyseDimensionalMapper.insertBatch(result);
+        if(result.size() > 0){
+            analyseDimensionalMapper.insertBatch(result);
+        }
         return  1 ;
     }
  
@@ -38,7 +38,9 @@ public class ClassCourseServiceImpl implements ClassCourseService {
                 result = new ArrayList<>();
             }
         }
-        classCourseMapper.insertBatch(result);
+        if(result.size()>0){
+            classCourseMapper.insertBatch(result);
+        }
         return 1;
     }
  
@@ -32,7 +32,9 @@ public class StudentDetailServiceImpl implements StudentDetailService {
                 result = new ArrayList<>();
             }
         }
-        studentDetailMapper.insertBatch(result);
+        if(result.size()>0){
+            studentDetailMapper.insertBatch(result);
+        }
         return  1 ;
     }
  
@@ -32,7 +32,9 @@ public class StudentServiceImpl implements StudentService {
                 result = new ArrayList<>();
             }
         }
-        studentMapper.insertBatch(result);
+        if(result.size()>0){
+            studentMapper.insertBatch(result);
+        }
         return  1 ;
     }
  
@@ -37,7 +37,9 @@ public class TeacherClassServiceImpl implements TeacherClassService {
                 result = new ArrayList<>();
             }
         }
-        teacherClassMapper.insertBatch(result);
+        if(result.size()>0){
+            teacherClassMapper.insertBatch(result);
+        }
         return 1;
     }
  
@@ -31,7 +31,9 @@ public class TeacherCourseServiceImpl implements TeacherCourseService {
                 result = new ArrayList<>();
             }
         }
-        teacherCourseMapper.insertBatch(result);
+        if(result.size()>0){
+            teacherCourseMapper.insertBatch(result);
+        }
         return 1;
     }
...	...	@@ -236,57 +236,60 @@ public class ScheduleInitController {
236	236	}
237	237	courseNumber = j - 1;
238	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	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	295	teacherClassService.insertBatch(teacherClasses);
...	...	@@ -297,7 +300,7 @@ public class ScheduleInitController {
297	300	baseVo.setSuccess(false);
298	301	}
299	302	}catch (Exception e){
300		- System.out.println(e);
	303	+ e.printStackTrace();
301	304	baseVo.setSuccess(false);
302	305	}
303	306	return baseVo;
...	...
...	...	@@ -32,7 +32,9 @@ public class AnalyseDetailServiceImpl implements AnalyseDetailService {
32	32	result = new ArrayList<>();
33	33	}
34	34	}
35		- analyseDetailMapper.insertBatch(result);
	35	+ if(result.size() > 0){
	36	+ analyseDetailMapper.insertBatch(result);
	37	+ }
36	38	return 1 ;
37	39	}
38	40
...	...
...	...	@@ -32,7 +32,9 @@ public class AnalyseDimensionalServiceImpl implements AnalyseDimensionalService
32	32	result = new ArrayList<>();
33	33	}
34	34	}
35		- analyseDimensionalMapper.insertBatch(result);
	35	+ if(result.size() > 0){
	36	+ analyseDimensionalMapper.insertBatch(result);
	37	+ }
36	38	return 1 ;
37	39	}
38	40
...	...
...	...	@@ -38,7 +38,9 @@ public class ClassCourseServiceImpl implements ClassCourseService {
38	38	result = new ArrayList<>();
39	39	}
40	40	}
41		- classCourseMapper.insertBatch(result);
	41	+ if(result.size()>0){
	42	+ classCourseMapper.insertBatch(result);
	43	+ }
42	44	return 1;
43	45	}
44	46
...	...
...	...	@@ -32,7 +32,9 @@ public class StudentDetailServiceImpl implements StudentDetailService {
32	32	result = new ArrayList<>();
33	33	}
34	34	}
35		- studentDetailMapper.insertBatch(result);
	35	+ if(result.size()>0){
	36	+ studentDetailMapper.insertBatch(result);
	37	+ }
36	38	return 1 ;
37	39	}
38	40
...	...
...	...	@@ -32,7 +32,9 @@ public class StudentServiceImpl implements StudentService {
32	32	result = new ArrayList<>();
33	33	}
34	34	}
35		- studentMapper.insertBatch(result);
	35	+ if(result.size()>0){
	36	+ studentMapper.insertBatch(result);
	37	+ }
36	38	return 1 ;
37	39	}
38	40
...	...
...	...	@@ -37,7 +37,9 @@ public class TeacherClassServiceImpl implements TeacherClassService {
37	37	result = new ArrayList<>();
38	38	}
39	39	}
40		- teacherClassMapper.insertBatch(result);
	40	+ if(result.size()>0){
	41	+ teacherClassMapper.insertBatch(result);
	42	+ }
41	43	return 1;
42	44	}
43	45
...	...
...	...	@@ -31,7 +31,9 @@ public class TeacherCourseServiceImpl implements TeacherCourseService {
31	31	result = new ArrayList<>();
32	32	}
33	33	}
34		- teacherCourseMapper.insertBatch(result);
	34	+ if(result.size()>0){
	35	+ teacherCourseMapper.insertBatch(result);
	36	+ }
35	37	return 1;
36	38	}
37	39
...	...