学生成绩录入

src/main/java/com/xjrsoft/module/xycxedu/service/impl/ExamSubjectScoreEnterServiceImpl.java

@@ -74,7 +74,7 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
     @Transactional(rollbackFor = Exception.class)
     public Boolean importData(Long id, MultipartFile file) throws IOException {
         ExamSubjectScoreEnter enter = this.getById(id);
-        List<ExamSubjectScoreEnterImportDto> dataList = EasyExcel.read(file.getInputStream()).headRowNumber(2).head(ExamSubjectScoreEnterImportDto.class).sheet().doReadSync();
+        List<ExamSubjectScoreEnterImportDto> dataList = EasyExcel.read(file.getInputStream()).headRowNumber(3).head(ExamSubjectScoreEnterImportDto.class).sheet().doReadSync();
         List<BaseCourseSubject> classList = courseSubjectService.list(
                 new QueryWrapper<BaseCourseSubject>().lambda()
                         .eq(BaseCourseSubject::getDeleteMark, DeleteMark.NODELETE.getCode())
@@ -105,7 +105,7 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
             Long userId = userMaps.get(importVo.getCredentialNumber());
             ExamSubjectScore examSubjectScores = listMap.get(userId);
             examSubjectScores.setCourseSubjectId(enter.getCourseSubjectId());
-            examSubjectScores.setScore(Float.parseFloat(importVo.getScore()));
+            examSubjectScores.setScore(importVo.getScore()==null?null:Float.parseFloat(importVo.getScore()));
             examSubjectScores.setSemesterId(enter.getSemesterId());
             examSubjectScores.setExamSubjectScoreEnterId(enter.getId());
             examSubjectScores.setSemesterId(enter.getSemesterId());
@@ -117,8 +117,6 @@ public class ExamSubjectScoreEnterServiceImpl extends MPJBaseServiceImpl<ExamSub
         }
 
         if(!updateList.isEmpty()){
-            scoreService.remove(new QueryWrapper<ExamSubjectScore>().lambda().eq(ExamSubjectScore::getExamSubjectScoreEnterId, enter.getId()));
-
             scoreService.updateBatchById(updateList);
         }