pull error

src/main/java/com/template/api/WelcomeBedControllerAPI.java

@@ -84,7 +84,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/checkInBedGroup")
     @ApiOperation(value = "入住床位分组", notes = "入住床位分组", httpMethod = "GET")
-    CommonResult checkInBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId);
+    CommonResult checkInBedGroup(Integer schoolId,Integer buildId,Integer dormitoryId,Integer bedId);
 
     @PostMapping(value = "/replaceBed")
     @ApiOperation(value = "床位对调", notes = "床位对调", httpMethod = "POST")

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.template.api.WelcomeBedControllerAPI;
+import com.template.common.utils.BeanUtil;
 import com.template.common.utils.ExcelUtils;
 import com.template.common.utils.paramUtils;
 import com.template.model.enumModel.eFileType;
@@ -801,13 +802,7 @@ 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);
+        welcomeBedService.updateData(bedId);
 
         //        修改寝室信息
         WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(bed.getDormitoryId());
@@ -837,7 +832,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(sourceBed) || ObjectUtils.isEmpty(changeBed)) {
             return CommonResult.fail("床位不存在");
         }
-        ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
+
         changeBed.setIsCheck(1);
         changeBed.setStudentCard(sourceBed.getStudentCard());
         changeBed.setCardNum(sourceBed.getCardNum());
@@ -847,18 +842,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         changeBed.setMajorId(sourceBed.getMajorId());
         changeBed.setMajor(sourceBed.getMajor());
         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);
+
+        welcomeBedService.updateData(sourceBedId);
+
 
         //        修改寝室信息
         WelcomeDormitory welcomeDormitoryC = welcomeDormitoryService.getById(changeBed.getDormitoryId());
@@ -891,15 +877,15 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             welcomeDormitoryService.updateById(welcomeDormitory);
         }
 
-        welcomeBedService.updateBatchById(welcomeBeds);
+        welcomeBedService.updateById(changeBed);
 
         return CommonResult.ok();
     }
 
     @Override
-    public CommonResult checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId) {
+    public CommonResult checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId) {
         //        获取已入住的床位
-        List<WelcomeBed> beds = welcomeBedService.checkInBedGroup(schoolId, buildId, dormitoryId);
+        List<WelcomeBed> beds = welcomeBedService.checkInBedGroup(schoolId, buildId, dormitoryId,bedId);
 
         return CommonResult.ok(beds);
     }
@@ -914,6 +900,11 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             return CommonResult.fail("床位不存在");
         }
 //        源数据
+        WelcomeBed welcomeBed = new WelcomeBed();
+        BeanUtil.copyProperties(sourceBed,welcomeBed);
+        WelcomeBed welcomeBed2 = new WelcomeBed();
+        BeanUtil.copyProperties(changeBed,welcomeBed2);
+
         String studentCard = sourceBed.getStudentCard();
         String cardNum = sourceBed.getCardNum();
         Integer classstrId = sourceBed.getClassstrId();
@@ -934,27 +925,27 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         String instructor2 = changeBed.getInstructor();
 
 
-        sourceBed.setStudentCard(studentCard2);
-        sourceBed.setCardNum(cardNum2);
-        sourceBed.setClassstrId(classstrId2);
-        sourceBed.setClassstr(classstr2);
-        sourceBed.setName(name2);
-        sourceBed.setMajorId(majorId2);
-        sourceBed.setMajor(major2);
-        sourceBed.setInstructor(instructor2);
-
-        changeBed.setStudentCard(studentCard);
-        changeBed.setCardNum(cardNum);
-        changeBed.setClassstrId(classstrId);
-        changeBed.setClassstr(classstr);
-        changeBed.setName(name);
-        changeBed.setMajorId(majorId);
-        changeBed.setMajor(major);
-        changeBed.setInstructor(instructor);
+        welcomeBed.setStudentCard(studentCard2);
+        welcomeBed.setCardNum(cardNum2);
+        welcomeBed.setClassstrId(classstrId2);
+        welcomeBed.setClassstr(classstr2);
+        welcomeBed.setName(name2);
+        welcomeBed.setMajorId(majorId2);
+        welcomeBed.setMajor(major2);
+        welcomeBed.setInstructor(instructor2);
+
+        welcomeBed2.setStudentCard(studentCard);
+        welcomeBed2.setCardNum(cardNum);
+        welcomeBed2.setClassstrId(classstrId);
+        welcomeBed2.setClassstr(classstr);
+        welcomeBed2.setName(name);
+        welcomeBed2.setMajorId(majorId);
+        welcomeBed2.setMajor(major);
+        welcomeBed2.setInstructor(instructor);
 
         ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
-        welcomeBeds.add(sourceBed);
-        welcomeBeds.add(changeBed);
+        welcomeBeds.add(welcomeBed);
+        welcomeBeds.add(welcomeBed2);
 
         welcomeBedService.updateBatchById(welcomeBeds);
         return CommonResult.ok();

src/main/java/com/template/mapper/WelcomeBedMapper.java

@@ -31,4 +31,6 @@ public interface WelcomeBedMapper extends BaseMapper<WelcomeBed> {
     List<BedSqlTotalVo> queryBedSqlList(@Param("collegeId") Integer collegeId,@Param("sex") String sex);
 
     List<SleepSqlTotalVo> queryTotalSqlList(@Param("collegeId") Integer collegeId,@Param("sex") String sex);
+
+    void updateData(@Param("bedId") Integer bedId);
 }

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

@@ -48,7 +48,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     WelcomeBedCheckVo isCheck(String studentCard);
 
-    List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId);
+    List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId);
 
     PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name);
 
@@ -57,4 +57,6 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
     List<BedSqlTotalVo> queryBedSqlList(Integer collegeId, String sex);
 
     List<SleepSqlTotalVo> queryTotalSqlList(Integer collegeId, String sex);
+
+    void updateData(Integer bedId);
 }

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

@@ -60,7 +60,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);
     }
@@ -166,13 +166,14 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId) {
+    public List<WelcomeBed> checkInBedGroup(Integer schoolId, Integer buildId, Integer dormitoryId,Integer bedId) {
         LambdaQueryWrapper<WelcomeBed> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
                 .eq(WelcomeBed::getBuildId, buildId)
                 .eq(WelcomeBed::getDormitoryId, dormitoryId)
                 .eq(WelcomeBed::getIsCheck, 1)
-                .eq(WelcomeBed::getRetentionState,1);
+                .eq(WelcomeBed::getRetentionState,1)
+                .ne(WelcomeBed::getId,bedId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }
@@ -189,7 +190,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);
     }
@@ -205,7 +206,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;
     }
@@ -222,4 +223,8 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         return result;
     }
 
+    public void updateData(Integer bedId) {
+        welcomeBedMapper.updateData(bedId);
+    }
+
 }

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

@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.WelcomeBedMapper">
+    <update id="updateData">
+        UPDATE `welcome_bed`
+        SET is_check = 0,
+            student_card = NULL,
+            card_num = NULL,
+            classstr_id = NULL,
+            classstr = NULL,
+            `name` = NULL,
+            major = NULL,
+            major_id = NULL,
+            instructor = NULL
+        WHERE
+            id = #{bedId}
+    </update>
 
     <select id="getBedList" resultType="com.template.model.vo.BedDetailsVo">
         SELECT