Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

src/main/java/com/template/controller/WelcomeBedController.java

@@ -269,20 +269,16 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             return CommonResult.fail("床位信息数据导入只支持Xls或Xlsx格式文件");
         }
 
-        List<String> admissNums = result.stream().map(WelcomeBed::getCardNum).distinct().collect(Collectors.toList());
-        if (admissNums != null && admissNums.size() > 0) {
-            List<WelcomeStudent> students = welcomeStudentService.getDataByAdmissNum(admissNums);
-            if (students != null && students.size() > 0) {
-                for (WelcomeBed r : result) {
-                    Optional<WelcomeStudent> os = students.stream().filter(e -> e.getAdmissNum().equals(r.getCardNum())).findFirst();
-                    if (os != null && os.isPresent()) {
-                        r.setStudentCard(os.get().getCardId());
-                    }
-                }
+        //        去掉导入表的重复数据
+        ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
+        for (int i = 0; i < result.size(); i++) {
+            WelcomeBed welcomeBed = result.get(i);
+            if (!welcomeBeds.contains(welcomeBed)) {
+                welcomeBeds.add(welcomeBed);
             }
         }
 
-        boolean resultBool = welcomeBedService.saveOrUpdateBatch(result);
+        boolean resultBool = welcomeBedService.saveOrUpdateBatch(welcomeBeds);
 
         System.out.println("导入楼栋1");
         return resultBool ? CommonResult.ok("导入成功") : CommonResult.fail("导入失败");

src/main/java/com/template/controller/WelcomeBuildController.java

@@ -153,7 +153,17 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
             return CommonResult.fail("楼栋信息数据导入只支持Xls或Xlsx格式文件");
         }
 
-        boolean resultBool = welcomeBuildService.saveOrUpdateBatch(result);
+//        去掉导入表的重复数据
+        ArrayList<WelcomeBuild> welcomeBuilds = new ArrayList<>();
+        for (int i = 0; i < result.size(); i++) {
+            WelcomeBuild welcomeBuild = result.get(i);
+            if (!welcomeBuilds.contains(welcomeBuild)) {
+                welcomeBuilds.add(welcomeBuild);
+            }
+
+        }
+
+        boolean resultBool = welcomeBuildService.saveOrUpdateBatch(welcomeBuilds);
 
         System.out.println("导入楼栋1");
         return resultBool ? CommonResult.ok("导入成功") : CommonResult.fail("导入失败");

src/main/java/com/template/controller/WelcomeDormitoryController.java

@@ -374,7 +374,17 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             return CommonResult.fail("楼栋信息数据导入只支持Xls或Xlsx格式文件");
         }
 
-        boolean resultBool = welcomeDormitoryService.saveOrUpdateBatch(result);
+//        去掉导入表的重复数据
+        ArrayList<WelcomeDormitory> welcomeDormitories = new ArrayList<>();
+        for (int i = 0; i < result.size(); i++) {
+            WelcomeDormitory welcomeDormitory = result.get(i);
+            if (!welcomeDormitories.contains(welcomeDormitory)) {
+                welcomeDormitories.add(welcomeDormitory);
+            }
+
+        }
+
+        boolean resultBool = welcomeDormitoryService.saveOrUpdateBatch(welcomeDormitories);
 
         System.out.println("导入楼栋1");
         return resultBool ? CommonResult.ok("导入成功") : CommonResult.fail("导入失败");