课程表导入bug

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/CurriculumServiceImpl.java

@@ -252,27 +252,25 @@ public class CurriculumServiceImpl implements CurriculumService {
                     //插入主表数据
                     curriculumMapper.insertSelective(curriculumDTO);
                     Long mainId = curriculumDTO.getId();
+                    int detno = 1;
+                    List<CurriculumDetailDTO> curriculumDetailDTOList = new ArrayList<>();
                     for (DataImportDetail dataImportDetail : dataImportDetailList) {
-                        List<CurriculumDetailDTO> curriculumDetailDTOList = JsonUtils.fromJsonArray(dataImportDetail.getDd_detaildata(), CurriculumDetailDTO.class);
+                        CurriculumDetailDTO curriculumDetailDTO = JsonUtils.fromJsonString(dataImportDetail.getDd_detaildata(), CurriculumDetailDTO.class);
                         //插入明细表数据
                         //1. 替换课程名称为ID
                         List<SubjectDO> subjectDOList = curriculumMapper.selectSubject(schoolId);
-                        Iterator<CurriculumDetailDTO> detailIterator = curriculumDetailDTOList.iterator();
-                        int detno = 1;
-                        while (detailIterator.hasNext()){
-                            CurriculumDetailDTO curriculumDetailDTO = detailIterator.next();
-                            curriculumDetailDTO.setmId(mainId);
-                            curriculumDetailDTO.setStatus(1);
-                            curriculumDetailDTO.setSchoolId(schoolId);
-                            curriculumDetailDTO.setClazzId(clazzId);
-                            curriculumDetailDTO.setLessons(detno++);
-                            List<String> subNameList = subjectDOList.stream().map(SubjectDO::getSubjectName).collect(Collectors.toList());
-                            checkExists(curriculumDetailDTO, subNameList);
-                            subjectDOList.forEach(subjectDO -> { convertToId(curriculumDetailDTO, subjectDO); });
-                        }
-                        //2. 插入
-                        curriculumMapper.insertDetailSelective(curriculumDetailDTOList);
+                        curriculumDetailDTO.setmId(mainId);
+                        curriculumDetailDTO.setStatus(1);
+                        curriculumDetailDTO.setSchoolId(schoolId);
+                        curriculumDetailDTO.setClazzId(clazzId);
+                        curriculumDetailDTO.setLessons(detno++);
+                        List<String> subNameList = subjectDOList.stream().map(SubjectDO::getSubjectName).collect(Collectors.toList());
+                        checkExists(curriculumDetailDTO, subNameList);
+                        subjectDOList.forEach(subjectDO -> { convertToId(curriculumDetailDTO, subjectDO); });
+                        curriculumDetailDTOList.add(curriculumDetailDTO);
                     }
+                    //2. 插入
+                    curriculumMapper.insertDetailSelective(curriculumDetailDTOList);
                 }
             }
         }