更新

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

@@ -801,22 +801,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(bed)) {
             return CommonResult.fail("无该床铺信息");
         }
-        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);
+        welcomeBedService.updateData(bedId);
 
         //        修改寝室信息
         WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(bed.getDormitoryId());
@@ -846,7 +831,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());
@@ -856,24 +841,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         changeBed.setMajorId(sourceBed.getMajorId());
         changeBed.setMajor(sourceBed.getMajor());
         changeBed.setInstructor(sourceBed.getInstructor());
-        welcomeBeds.add(changeBed);
 
-        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);
+        welcomeBedService.updateData(sourceBedId);
 
 
         //        修改寝室信息
@@ -907,7 +876,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             welcomeDormitoryService.updateById(welcomeDormitory);
         }
 
-        welcomeBedService.updateBatchById(welcomeBeds);
+        welcomeBedService.updateById(changeBed);
 
         return CommonResult.ok();
     }

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

@@ -25,4 +25,6 @@ public interface WelcomeBedMapper extends BaseMapper<WelcomeBed> {
     BedDetailsVo getBedDetailsVo(@Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId, @Param("dormitoryId") Integer dormitoryId, @Param("studentCard") String studentCard);
 
     WelcomeBedCheckVo isCheck(@Param("studentCard") String studentCard);
+
+    void updateData(@Param("bedId") Integer bedId);
 }

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

@@ -51,4 +51,6 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
     PageUtils<WelcomeBed> studentAccommodationPage(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name);
 
     List<WelcomeBed> studentAccommodationList(Integer schoolId, Integer buildId, Integer dormitoryId, Integer collegeId, Integer majorId, Integer classstrId, String name);
+
+    void updateData(Integer bedId);
 }

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

@@ -208,4 +208,9 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         return result;
     }
 
+    @Override
+    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