修改冲突 修改Swagger注解文件描述

controller/src/main/java/com/koobietech/eas/controller/EasArcTlsAttendanceController.java

@@ -56,6 +56,7 @@ public class EasArcTlsAttendanceController {
     }
 
 
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除签到记录", description = "删除签到记录数据根据时间和学员student_number")
     public JsonResult delete(@RequestBody EasArcTlsAttendance attendance) {

service/src/main/java/com/koobietech/eas/service/impl/EasArcTlsScoresServiceImpl.java

@@ -137,15 +137,18 @@ public class EasArcTlsScoresServiceImpl implements EasArcTlsScoresService {
         try {
             List<EasArcTlsScoresPojo> score = ExcelImportUtil.importExcel(
                     inputStream, EasArcTlsScoresPojo.class, params);
+            EasArcTlsScores easArcTlsScores = null;
             for ( EasArcTlsScoresPojo easArcTlsScoresPojo : score) {
                 if ( easArcTlsScoresPojo.getScore() == null
                         || easArcTlsScoresPojo.getScore().equals("") ) {
                     continue;
                 }
                 easArcTlsScoresPojo.setCreateTime(new Date());
-                EasArcTlsScores easArcTlsScores = new EasArcTlsScores();
+                easArcTlsScores = new EasArcTlsScores();
                 BeanUtil.copyProperties(easArcTlsScoresPojo, easArcTlsScores);
                 easArcTlsScoresMapper.insert(easArcTlsScores);
+            }
+            if ( Objects.nonNull(easArcTlsScores) ) {
                 saveStudentScoreArchive(easArcTlsScores);
             }
         } catch (FileNotFoundException e) {