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

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

@@ -215,12 +215,17 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         //        当学院为空
         PageUtils<WelcomeBed> result=null;
         if (ObjectUtils.isEmpty(collegeId)) {
-            String collegeIds = "";
             WelcomeAccount account = welcomeAccountService.getById(accountId);
             if (ObjectUtils.isEmpty(account)) {
                 return CommonResult.fail("当前账号不存在,请重新登入");
             }
-            collegeIds = account.getCollegeId();
+            String aClassstrId = account.getCollegeId();
+            String[] split = aClassstrId.split(",");
+            List<String> collegeIds = new ArrayList<>();
+
+            for (String s : split) {
+                collegeIds.add(s);
+            }
             result = welcomeBedService.queryPageWelcomeBedsC(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId,retentionState);
         }else {
            result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
@@ -392,7 +397,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setSchoolId(wsl.get().getId());
                                 bedData.setSchool(school);
                             } else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该校区");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" +h+ "行,不存在该校区");
                             }
                         }
 
@@ -403,7 +409,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setBuild(build);
                                 bedData.setBuildId(oBuild.get().getId());
                             }else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该楼栋");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该楼栋");
                             }
                         }
 
@@ -412,16 +419,19 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e -> e.getDormitory().equals(dormitory)).findFirst();
                             if (oDormitory != null && oDormitory.isPresent()) {
                                 if (!oDormitory.get().getSex().equals(sex)) {
-                                    return CommonResult.fail("第" + rowNum + 1 + "行,床位性别和寝室性别不一致");
+                                    int h=rowNum+1;
+                                    return CommonResult.fail("第" + h + "行,床位性别和寝室性别不一致");
                                 }
                                 if (!oDormitory.get().getCollege().equals(college)) {
-                                    return CommonResult.fail("第" + rowNum + 1 + "行,床位院系和寝室院系不一致");
+                                    int h=rowNum+1;
+                                    return CommonResult.fail("第" + h + "行,床位院系和寝室院系不一致");
                                 }
 
                                 bedData.setDormitory(dormitory);
                                 bedData.setDormitoryId(oDormitory.get().getId());
                             }else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该寝室号");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该寝室号");
                             }
                         }
 
@@ -434,7 +444,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setCollege(college);
                             bedData.setCollegeId(owo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该院系");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该院系");
                         }
 
                         Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major)).findFirst();
@@ -442,7 +453,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setMajor(major);
                             bedData.setMajorId(omwo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该专业");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该专业");
                         }
 
                         Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr)).findFirst();
@@ -450,7 +462,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setClassstr(classstr);
                             bedData.setClassstrId(ocwo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该班级");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该班级");
                         }
                         //endregion
 
@@ -576,7 +589,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setSchoolId(wsl.get().getId());
                                 bedData.setSchool(school);
                             } else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该校区");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该校区");
                             }
                         }
 
@@ -587,7 +601,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setBuild(build);
                                 bedData.setBuildId(oBuild.get().getId());
                             }else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该楼栋");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该楼栋");
                             }
                         }
 
@@ -596,16 +611,19 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e -> e.getDormitory().equals(dormitory)).findFirst();
                             if (oDormitory != null && oDormitory.isPresent()) {
                                 if (!oDormitory.get().getSex().equals(sex)) {
-                                    return CommonResult.fail("第" + rowNum + 1 + "行,床位性别和寝室性别不一致");
+                                    int h=rowNum+1;
+                                    return CommonResult.fail("第" + h + "行,床位性别和寝室性别不一致");
                                 }
                                 if (!oDormitory.get().getCollege().equals(college)) {
-                                    return CommonResult.fail("第" + rowNum + 1 + "行,床位院系和寝室院系不一致");
+                                    int h=rowNum+1;
+                                    return CommonResult.fail("第" + h + "行,床位院系和寝室院系不一致");
                                 }
 
                                 bedData.setDormitory(dormitory);
                                 bedData.setDormitoryId(oDormitory.get().getId());
                             }else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该寝室号");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该寝室号");
                             }
                         }
 
@@ -618,7 +636,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setCollege(college);
                             bedData.setCollegeId(owo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该院系");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该院系");
                         }
 
                         Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major)).findFirst();
@@ -626,7 +645,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setMajor(major);
                             bedData.setMajorId(omwo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该专业");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该专业");
                         }
 
                         Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr)).findFirst();
@@ -634,7 +654,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setClassstr(classstr);
                             bedData.setClassstrId(ocwo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该班级");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该班级");
                         }
                         //endregion
 
@@ -665,12 +686,17 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         //        当学院为空
         List<WelcomeBed> result=null;
         if (ObjectUtils.isEmpty(collegeId)) {
-            String collegeIds = "";
             WelcomeAccount account = welcomeAccountService.getById(accountId);
             if (ObjectUtils.isEmpty(account)) {
                 throw new RuntimeException("当前账号不存在,请重新登入");
             }
-            collegeIds = account.getCollegeId();
+            String aClassstrId = account.getCollegeId();
+            String[] split = aClassstrId.split(",");
+            List<String> collegeIds = new ArrayList<>();
+
+            for (String s : split) {
+                collegeIds.add(s);
+            }
             result = welcomeBedService.queryPageWelcomeBedsS(schoolId, buildId, dormitoryId, sex, isCheck, collegeIds, majorId, classstrId,retentionState);
         }else {
             result = welcomeBedService.queryPageWelcomeBeds(schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
@@ -1073,12 +1099,17 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         //        当学院为空
         PageUtils<WelcomeBed> result=null;
         if (ObjectUtils.isEmpty(collegeId)) {
-            String collegeIds = "";
             WelcomeAccount account = welcomeAccountService.getById(accountId);
             if (ObjectUtils.isEmpty(account)) {
                 return CommonResult.fail("当前账号不存在,请重新登入");
             }
-            collegeIds = account.getCollegeId();
+            String aClassstrId = account.getCollegeId();
+            String[] split = aClassstrId.split(",");
+            List<String> collegeIds = new ArrayList<>();
+
+            for (String s : split) {
+                collegeIds.add(s);
+            }
             result = welcomeBedService.studentAccommodationPageS(currentPage, pageCount, schoolId, buildId, dormitoryId,collegeIds, majorId, classstrId,name);
         }else {
             result = welcomeBedService.studentAccommodationPage(currentPage, pageCount, schoolId, buildId, dormitoryId,collegeId, majorId, classstrId,name);
@@ -1091,12 +1122,17 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         //        当学院为空
         List<WelcomeBed> result=null;
         if (ObjectUtils.isEmpty(collegeId)) {
-            String collegeIds = "";
             WelcomeAccount account = welcomeAccountService.getById(accountId);
             if (ObjectUtils.isEmpty(account)) {
                 throw new RuntimeException("当前账号不存在,请重新登入");
             }
-            collegeIds = account.getCollegeId();
+            String aClassstrId = account.getCollegeId();
+            String[] split = aClassstrId.split(",");
+            List<String> collegeIds = new ArrayList<>();
+
+            for (String s : split) {
+                collegeIds.add(s);
+            }
             result =welcomeBedService.studentAccommodationListS( schoolId, buildId, dormitoryId,collegeIds, majorId, classstrId,name);
         }else {
             result = welcomeBedService.studentAccommodationList( schoolId, buildId, dormitoryId,collegeId, majorId, classstrId,name);

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

@@ -226,7 +226,8 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
                         if (wos != null && wos.isPresent()) {
                             buildData.setSchoolId(wos.get().getId()+"");
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该校区");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该校区");
                         }
                         String build = dataFormatter.formatCellValue(row.getCell(2));//楼栋名称
                         Optional<WelcomeBuild> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
@@ -324,7 +325,8 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
                         if (wos != null && wos.isPresent()) {
                             buildData.setSchoolId(wos.get().getId()+"");
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该校区");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该校区");
                         }
                         String build = dataFormatter.formatCellValue(row.getCell(2));//楼栋名称
                         Optional<WelcomeBuild> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();

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

@@ -468,20 +468,23 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                             wd.setSchoolId(wos.get().getId());
                             wd.setSchool(school);
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该校区");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该校区");
                         }
 
 
                         Optional<WelcomeBuild> oBuild = buildDatas.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
                         if (oBuild != null && oBuild.isPresent()) {
                             if (!sex.equals(oBuild.get().getSex())) {
-                                return CommonResult.fail("第"+rowNum+1+"行,宿舍性别和楼栋性别不一致");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第"+h+"行,宿舍性别和楼栋性别不一致");
                             }
                             wd.setBuild(build);
                             wd.setBuildId(oBuild.get().getId());
 
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该楼栋");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该楼栋");
                         }
                         wd.setDormitory(dormitory);
                         wd.setSex(sex);
@@ -491,7 +494,8 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                             wd.setCollege(college);
                             wd.setCollegeId(oCollege.get().getId());
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该学院");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该学院");
                         }
 
                         wd.setBedNumber(Integer.valueOf(bedNum));
@@ -600,19 +604,22 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                             wd.setSchoolId(wos.get().getId());
                             wd.setSchool(school);
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该校区");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该校区");
                         }
 
                         Optional<WelcomeBuild> oBuild = buildDatas.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
                         if (oBuild != null && oBuild.isPresent()) {
                             if (!sex.equals(oBuild.get().getSex())) {
-                                return CommonResult.fail("第"+rowNum+1+"行,宿舍性别和楼栋性别不一致");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第"+h+"行,宿舍性别和楼栋性别不一致");
                             }
                             wd.setBuild(build);
                             wd.setBuildId(oBuild.get().getId());
 
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该楼栋");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该楼栋");
                         }
                         wd.setDormitory(dormitory);
                         wd.setSex(sex);
@@ -622,7 +629,8 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                             wd.setCollege(college);
                             wd.setCollegeId(oCollege.get().getId());
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该学院");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该学院");
                         }
 
                         wd.setBedNumber(Integer.valueOf(bedNum));

src/main/java/com/template/services/WelcomeBedService.java

@@ -80,12 +80,12 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     List<WelcomeBed> hBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrid, String sex);
 
-    PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
+    PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
 
 
-    List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
+    List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState);
 
-    PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String collegeIds, Integer majorId, Integer classstrId, String name);
+    PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds , Integer majorId, Integer classstrId, String name);
 
-    List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, String collegeIds, Integer majorId, Integer classstrId, String name);
+    List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name);
 }

src/main/java/com/template/services/impl/WelcomeBedServiceImpl.java

@@ -365,7 +365,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState) {
+    public PageUtils<WelcomeBed> queryPageWelcomeBedsC(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -383,7 +383,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, String collegeIds, Integer majorId, Integer classstrId, Integer retentionState) {
+    public List<WelcomeBed> queryPageWelcomeBedsS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, List<String> collegeIds, Integer majorId, Integer classstrId, Integer retentionState) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
@@ -399,7 +399,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String collegeIds, Integer majorId, Integer classstrId, String name) {
+    public PageUtils<WelcomeBed> studentAccommodationPageS(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -416,7 +416,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, String collegeIds, Integer majorId, Integer classstrId, String name) {
+    public List<WelcomeBed> studentAccommodationListS(Integer schoolId, Integer buildId, Integer dormitoryId, List<String> collegeIds, Integer majorId, Integer classstrId, String name) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);