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

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

@@ -442,24 +442,29 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         }
 
 //                        专业
-                        Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
-                        if (omwo != null && omwo.isPresent()) {
-                            bedData.setMajor(major);
-                            bedData.setMajorId(omwo.get().getId());
-                        } else {
-                            int h = rowNum + 1;
-                            return CommonResult.fail("第" + h + "行,不存在该专业");
-                        }
+                        if (ObjectUtils.isNotEmpty(major) && ObjectUtils.isNotEmpty(classstr)) {
+                            Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
+                            if (omwo != null && omwo.isPresent()) {
+                                bedData.setMajor(major);
+                                bedData.setMajorId(omwo.get().getId());
+                            } else {
+                                int h = rowNum + 1;
+                                return CommonResult.fail("第" + h + "行,不存在该专业");
+                            }
+
+                            //                        班级
+                            Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr) && e.getParentId().equals(omwo.get().getId())).findFirst();
+                            if (ocwo != null && ocwo.isPresent()) {
+                                bedData.setClassstr(classstr);
+                                bedData.setClassstrId(ocwo.get().getId());
+                            } else {
+                                int h = rowNum + 1;
+                                return CommonResult.fail("第" + h + "行,不存在该班级");
+                            }
 
-//                        班级
-                        Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr) && e.getParentId().equals(omwo.get().getId())).findFirst();
-                        if (ocwo != null && ocwo.isPresent()) {
-                            bedData.setClassstr(classstr);
-                            bedData.setClassstrId(ocwo.get().getId());
-                        } else {
-                            int h = rowNum + 1;
-                            return CommonResult.fail("第" + h + "行,不存在该班级");
                         }
+
+
                         //endregion
 
                         bedData.setIsCheck(0);
@@ -637,23 +642,25 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         }
 
 //                        专业
-                        Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
-                        if (omwo != null && omwo.isPresent()) {
-                            bedData.setMajor(major);
-                            bedData.setMajorId(omwo.get().getId());
-                        } else {
-                            int h = rowNum + 1;
-                            return CommonResult.fail("第" + h + "行,不存在该专业");
-                        }
+                        if (ObjectUtils.isNotEmpty(major) && ObjectUtils.isNotEmpty(classstr)) {
+                            Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major) && e.getParentId().equals(owo.get().getId())).findFirst();
+                            if (omwo != null && omwo.isPresent()) {
+                                bedData.setMajor(major);
+                                bedData.setMajorId(omwo.get().getId());
+                            } else {
+                                int h = rowNum + 1;
+                                return CommonResult.fail("第" + h + "行,不存在该专业");
+                            }
 
 //                        班级
-                        Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr) && e.getParentId().equals(omwo.get().getId())).findFirst();
-                        if (ocwo != null && ocwo.isPresent()) {
-                            bedData.setClassstr(classstr);
-                            bedData.setClassstrId(ocwo.get().getId());
-                        } else {
-                            int h = rowNum + 1;
-                            return CommonResult.fail("第" + h + "行,不存在该班级");
+                            Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr) && e.getParentId().equals(omwo.get().getId())).findFirst();
+                            if (ocwo != null && ocwo.isPresent()) {
+                                bedData.setClassstr(classstr);
+                                bedData.setClassstrId(ocwo.get().getId());
+                            } else {
+                                int h = rowNum + 1;
+                                return CommonResult.fail("第" + h + "行,不存在该班级");
+                            }
                         }
                         //endregion
 
@@ -1340,16 +1347,16 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                 String dormitory = bed.getDormitory();
                 if ("16栋".equals(build) || "28栋".equals(build) || "29栋".equals(build)) {
                     vo.setLayoutNumber(2);
-                }else if ("9栋".equals(build)){
+                } else if ("9栋".equals(build)) {
                     if ("105".equals(dormitory)) {
                         vo.setLayoutNumber(3);
-                    }else {
+                    } else {
                         vo.setLayoutNumber(2);
                     }
-                }else if ("12栋".equals(build)){
-                    if ("219".equals(dormitory) || "319".equals(dormitory) || "419".equals(dormitory) || "519".equals(dormitory) || "619".equals(dormitory)){
+                } else if ("12栋".equals(build)) {
+                    if ("219".equals(dormitory) || "319".equals(dormitory) || "419".equals(dormitory) || "519".equals(dormitory) || "619".equals(dormitory)) {
                         vo.setLayoutNumber(5);
-                    }else {
+                    } else {
                         vo.setLayoutNumber(4);
                     }
                 }

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

@@ -57,7 +57,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.eq(retentionState != null, "retention_state", retentionState);
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("build","dormitory","number");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
@@ -97,6 +97,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.eq(retentionState != null, "retention_state", retentionState);
+        queryWrapper.orderByDesc("build","dormitory","number");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -374,7 +375,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.eq(retentionState != null, "retention_state", retentionState);
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("build","dormitory","number");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
@@ -391,6 +392,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.eq(retentionState != null, "retention_state", retentionState);
+        queryWrapper.orderByDesc("build","dormitory","number");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }

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

@@ -131,7 +131,8 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         LambdaQueryWrapper<WelcomeDormitory> queryWrapper=new LambdaQueryWrapper<>();
         queryWrapper.eq(WelcomeDormitory::getSchoolId,schoolId)
                 .in(WelcomeDormitory::getCollegeId,collegeIds)
-                .groupBy(WelcomeDormitory::getSchoolId,WelcomeDormitory::getBuildId);
+                .groupBy(WelcomeDormitory::getSchoolId,WelcomeDormitory::getBuildId)
+                .orderByDesc(WelcomeDormitory::getBuild,WelcomeDormitory::getDormitory);
         List<WelcomeDormitory> result = welcomeDormitoryMapper.selectList(queryWrapper);
         return result;
     }
@@ -146,7 +147,8 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
     public List<WelcomeDormitory> dormitoryTGroup(Integer schoolId, Integer buildId) {
         LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ObjectUtils.isNotEmpty(schoolId), WelcomeDormitory::getSchoolId, schoolId)
-                .eq(ObjectUtils.isNotEmpty(buildId), WelcomeDormitory::getBuildId, buildId);
+                .eq(ObjectUtils.isNotEmpty(buildId), WelcomeDormitory::getBuildId, buildId)
+                .orderByDesc(WelcomeDormitory::getBuild,WelcomeDormitory::getDormitory);;
         List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
         return welcomeDormitories;
     }

src/main/resources/mapper/template/WelcomeDormitoryMapper.xml

@@ -57,7 +57,7 @@
         <if test="retentionState != null and retentionState != ''">
             and wd.retention_state = #{retentionState}
         </if>
-        order by wd.create_time desc
+        order by wd.build,wd.dormitory desc
     </select>
     <select id="getTotalCount" resultType="com.template.model.vo.StudentStayVo">
         SELECT
@@ -118,7 +118,7 @@
         <if test="retentionState != null and retentionState != ''">
             and wd.retention_state = #{retentionState}
         </if>
-        order by wd.create_time desc
+        order by wd.build,wd.dormitory desc
     </select>
     <select id="listDormitoryCPage" resultType="com.template.model.vo.WelcomeDormitoryVo">
         SELECT