更新

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

@@ -801,13 +801,22 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(bed)) {
             return CommonResult.fail("无该床铺信息");
         }
-        bed.setIsCheck(0);
-        bed.setStudentCard(null);
-        bed.setCardNum(null);
-        bed.setClassstrId(null);
-        bed.setClassstr(null);
-        bed.setName(null);
-        welcomeBedService.updateWelcomeBed(bed);
+        WelcomeBed welcomeBed = new WelcomeBed();
+        welcomeBed.setId(bed.getId());
+        welcomeBed.setNumber(bed.getNumber());
+        welcomeBed.setSchool(bed.getSchool());
+        welcomeBed.setSchoolId(bed.getSchoolId());
+        welcomeBed.setBuild(bed.getBuild());
+        welcomeBed.setBuildId(bed.getBuildId());
+        welcomeBed.setDormitory(bed.getDormitory());
+        welcomeBed.setDormitoryId(bed.getId());
+        welcomeBed.setSex(bed.getSex());
+        welcomeBed.setCollege(bed.getCollege());
+        welcomeBed.setCollegeId(bed.getCollegeId());
+        welcomeBed.setGrade(bed.getGrade());
+        welcomeBed.setIsCheck(0);
+        welcomeBed.setRetentionState(bed.getRetentionState());
+        welcomeBedService.updateWelcomeBed(welcomeBed);
 
         //        修改寝室信息
         WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(bed.getDormitoryId());
@@ -849,16 +858,23 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         changeBed.setInstructor(sourceBed.getInstructor());
         welcomeBeds.add(changeBed);
 
-        sourceBed.setIsCheck(0);
-        sourceBed.setStudentCard(null);
-        sourceBed.setCardNum(null);
-        sourceBed.setClassstrId(null);
-        sourceBed.setClassstr(null);
-        sourceBed.setName(null);
-        sourceBed.setMajorId(null);
-        sourceBed.setMajor(null);
-        sourceBed.setInstructor(null);
-        welcomeBeds.add(sourceBed);
+        WelcomeBed welcomeBed = new WelcomeBed();
+        welcomeBed.setId(sourceBed.getId());
+        welcomeBed.setNumber(sourceBed.getNumber());
+        welcomeBed.setSchool(sourceBed.getSchool());
+        welcomeBed.setSchoolId(sourceBed.getSchoolId());
+        welcomeBed.setBuild(sourceBed.getBuild());
+        welcomeBed.setBuildId(sourceBed.getBuildId());
+        welcomeBed.setDormitory(sourceBed.getDormitory());
+        welcomeBed.setDormitoryId(sourceBed.getId());
+        welcomeBed.setSex(sourceBed.getSex());
+        welcomeBed.setCollege(sourceBed.getCollege());
+        welcomeBed.setCollegeId(sourceBed.getCollegeId());
+        welcomeBed.setGrade(sourceBed.getGrade());
+        welcomeBed.setIsCheck(0);
+        welcomeBed.setRetentionState(sourceBed.getRetentionState());
+        welcomeBeds.add(welcomeBed);
+
 
         //        修改寝室信息
         WelcomeDormitory welcomeDormitoryC = welcomeDormitoryService.getById(changeBed.getDormitoryId());

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

@@ -58,7 +58,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("update_time");
+        queryWrapper.orderByDesc("create_time");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
@@ -187,7 +187,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.like(name != null, "name", name);
         queryWrapper.eq( "is_check", 1);
-        queryWrapper.orderByDesc("update_time");
+        queryWrapper.orderByDesc("create_time");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);
     }
@@ -203,7 +203,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
         queryWrapper.like(name != null, "name", name);
         queryWrapper.eq( "is_check", 1);
-        queryWrapper.orderByDesc("update_time");
+        queryWrapper.orderByDesc("create_time");
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }