update 调整数据返回内容

src/main/java/cn/teammodel/controller/admin/controller/TeacherController.java

@@ -105,8 +105,8 @@ public class TeacherController {
     }
     @PostMapping("batchImportPtTeachers")
     @ApiOperation("批量导入教师信息")
-    public R<List<String>> batchImportPtTeachers(@Valid @RequestBody List<GpTeacherVo> gpTeacherDtos, HttpServletRequest request) {
+    public R<List<GpTeacherVo>> batchImportPtTeachers(@Valid @RequestBody List<GpTeacherVo> gpTeacherDtos, HttpServletRequest request) {
-        List<String> res = teacherService.batchImportPtTeachers(gpTeacherDtos,request);
+        List<GpTeacherVo> res = teacherService.batchImportPtTeachers(gpTeacherDtos,request);
         return R.success(res);
     }
     @PostMapping("findTeachers")

src/main/java/cn/teammodel/controller/admin/service/TeacherService.java

@@ -26,7 +26,7 @@ public interface TeacherService {
     void update (TeacherDto teacherDto);
     Map<String,Object> findIdentityByTmdId(TeacherDto teacherDto);
     void delete(TeacherDto teacherDto);
-    List<String>  batchImportPtTeachers(List<GpTeacherVo> gpTeachers, HttpServletRequest request);
+    List<GpTeacherVo>  batchImportPtTeachers(List<GpTeacherVo> gpTeachers, HttpServletRequest request);
     List<Map<String, Object>> findTeachers(CoreUser dto, HttpServletRequest request);
     List<PtTeacherInfo> saveOrUpdate(GpTeacherRequest gpTeacherRequest, HttpServletRequest request);
 }

src/main/java/cn/teammodel/controller/admin/service/impl/TeacherServiceImpl.java

@@ -1461,7 +1461,7 @@ public class TeacherServiceImpl implements TeacherService {
     }
 
     @Override
-    public List<String> batchImportPtTeachers(List<GpTeacherVo> gpTeachers,HttpServletRequest request) {
+    public List<GpTeacherVo> batchImportPtTeachers(List<GpTeacherVo> gpTeachers,HttpServletRequest request) {
 
         if (gpTeachers == null || gpTeachers.isEmpty()) {
             throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "导入数据为空");
@@ -1511,8 +1511,12 @@ public class TeacherServiceImpl implements TeacherService {
         List<String> missingPhones = phoneNumbers.stream()
                 .filter(phone -> !existingMobiles.contains(phone))
                 .collect(Collectors.toList());
-
+        List<GpTeacherVo> missingPhonesGpTeachers = new ArrayList<>();
         if (!missingPhones.isEmpty()) {
+            //创建一个集合，存储该手机号得对象
+            missingPhonesGpTeachers = gpTeachers.stream()
+                    .filter(t -> missingPhones.contains(t.getPhone()))
+                    .collect(Collectors.toList());
             //剔除含有这些号码的gpTeachers对象
             gpTeachers.removeIf(t -> missingPhones.contains(t.getPhone()));
             //throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "手机号未在IES5中创建账号: " + String.join(", ", missingPhones));
@@ -1637,7 +1641,7 @@ public class TeacherServiceImpl implements TeacherService {
                 gpTeachers.size(),
                 missingPhones.size());
 
-        return missingPhones;
+        return missingPhonesGpTeachers;
     }
 
     @Override