更新

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