|
@@ -381,10 +381,39 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
|
|
|
if (!welcomeDormitories.contains(welcomeDormitory)) {
|
|
if (!welcomeDormitories.contains(welcomeDormitory)) {
|
|
|
welcomeDormitories.add(welcomeDormitory);
|
|
welcomeDormitories.add(welcomeDormitory);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
|
|
|
boolean resultBool = welcomeDormitoryService.saveOrUpdateBatch(welcomeDormitories);
|
|
boolean resultBool = welcomeDormitoryService.saveOrUpdateBatch(welcomeDormitories);
|
|
|
|
|
+ if (resultBool) {
|
|
|
|
|
+ for (WelcomeDormitory welcomeDormitory : welcomeDormitories) {
|
|
|
|
|
+ if ("墨轩湖校区".equals(welcomeDormitory.getSchool()) && welcomeDormitory.getSchoolId().equals(1)) {
|
|
|
|
|
+ for (int i = 1; i <= 4; i++) {
|
|
|
|
|
+ WelcomeBed welcomeBed = new WelcomeBed();
|
|
|
|
|
+ welcomeBed.setNumber(i);
|
|
|
|
|
+ welcomeBed.setSchool(welcomeDormitory.getSchool());
|
|
|
|
|
+ welcomeBed.setSchoolId(welcomeDormitory.getSchoolId());
|
|
|
|
|
+ welcomeBed.setBuild(welcomeDormitory.getBuild());
|
|
|
|
|
+ welcomeBed.setBuildId(welcomeDormitory.getBuildId());
|
|
|
|
|
+ welcomeBed.setDormitory(welcomeDormitory.getDormitory());
|
|
|
|
|
+ welcomeBed.setDormitoryId(welcomeDormitory.getId());
|
|
|
|
|
+ welcomeBed.setSex(welcomeDormitory.getSex());
|
|
|
|
|
+ welcomeBed.setCollege(welcomeDormitory.getCollege());
|
|
|
|
|
+ welcomeBed.setCollegeId(welcomeDormitory.getCollegeId());
|
|
|
|
|
+ welcomeBed.setGrade(welcomeDormitory.getGrade());
|
|
|
|
|
+ welcomeBed.setIsCheck(0);
|
|
|
|
|
+ welcomeBed.setRetentionState(welcomeDormitory.getRetentionState());
|
|
|
|
|
+ welcomeBeds.add(welcomeBed);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ if (welcomeBeds != null && welcomeBeds.size() > 0) {
|
|
|
|
|
+ boolean insertBeds = welcomeBedService.saveBatch(welcomeBeds);
|
|
|
|
|
+ if (!insertBeds) {
|
|
|
|
|
+ return CommonResult.fail("新增床位失败");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
System.out.println("导入楼栋1");
|
|
System.out.println("导入楼栋1");
|
|
|
return resultBool ? CommonResult.ok("导入成功") : CommonResult.fail("导入失败");
|
|
return resultBool ? CommonResult.ok("导入成功") : CommonResult.fail("导入失败");
|