|
@@ -1360,23 +1360,20 @@ public class TaskLogicServiceImpl implements TaskLogicService {
|
|
|
}
|
|
|
BasicClazz basicClazz = this.validBasicClazzExists(clazzMap, statisticsImportDto.getClazzName(), sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "班级名称");
|
|
|
|
|
|
- if (excelErrorTemp.size() > 0) {
|
|
|
- List<String> errors = excelErrorTemp.stream().map(m -> m.getExcelErrorType()).collect(Collectors.toList());
|
|
|
- throw ExceptionResultEnum.ERROR.exception(JSONObject.toJSONString(errors));
|
|
|
+ if (excelErrorTemp.size() == 0) {
|
|
|
+ TCStatistics tcStatistics = new TCStatistics(collegeOrg.getId(),
|
|
|
+ collegeOrg.getName(),
|
|
|
+ teachingRoomOrg.getId(),
|
|
|
+ teachingRoomOrg.getName(),
|
|
|
+ basicCourse.getName(),
|
|
|
+ basicCourse.getCode(),
|
|
|
+ teacherName,
|
|
|
+ basicClazz.getId(),
|
|
|
+ basicClazz.getClazzName(),
|
|
|
+ batchNo,
|
|
|
+ sysUser.getId());
|
|
|
+ tcStatisticsList.add(tcStatistics);
|
|
|
}
|
|
|
-
|
|
|
- TCStatistics tcStatistics = new TCStatistics(collegeOrg.getId(),
|
|
|
- collegeOrg.getName(),
|
|
|
- teachingRoomOrg.getId(),
|
|
|
- teachingRoomOrg.getName(),
|
|
|
- basicCourse.getName(),
|
|
|
- basicCourse.getCode(),
|
|
|
- teacherName,
|
|
|
- basicClazz.getId(),
|
|
|
- basicClazz.getClazzName(),
|
|
|
- batchNo,
|
|
|
- sysUser.getId());
|
|
|
- tcStatisticsList.add(tcStatistics);
|
|
|
}
|
|
|
}
|
|
|
if (excelErrorTemp.size() > 0) {
|