更新

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

@@ -2,6 +2,7 @@ package com.template.api;
 
 import com.template.model.pojo.WelcomeDormitory;
 import com.template.model.result.CommonResult;
+import com.template.model.vo.BatchOperationVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -57,4 +58,8 @@ public interface WelcomeDormitoryControllerAPI {
     @ApiOperation(value = "导出寝室信息数据", notes = "导出寝室信息数据", httpMethod = "GET")
     void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId);
 
+    @PostMapping(value = "/batchOperation")
+    @ApiOperation(value = "批量操作", notes = "批量操作", httpMethod = "POST")
+    CommonResult batchOperation(@RequestBody BatchOperationVo batchOperationVo);
+
 }

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

@@ -11,6 +11,7 @@ import com.template.model.enumModel.eFileType;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.BatchOperationVo;
 import com.template.model.vo.WelcomeDormitoryVo;
 import com.template.services.*;
 import org.apache.poi.hssf.record.chart.FontIndexRecord;
@@ -77,6 +78,8 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
 //        添加时默认全空的
         welcomeDormitory.setStatus(2);
+//        默认保留
+        welcomeDormitory.setRetentionState(1);
         welcomeDormitory.setFreeBedNumber(welcomeDormitory.getBedNumber());
 
         boolean insertWd = welcomeDormitoryService.save(welcomeDormitory);
@@ -103,6 +106,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             welcomeBed.setMajor(welcomeDormitory.getMajor());
             welcomeBed.setMajorId(welcomeDormitory.getMajorId());
             welcomeBed.setIsCheck(0);
+            welcomeBed.setRetentionState(1);
             welcomeBeds.add(welcomeBed);
         }
 
@@ -626,5 +630,20 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         ExcelUtils.excelDownload(workbook, "寝室信息.xlsx", response);
     }
 
+    @Override
+    public CommonResult batchOperation(BatchOperationVo batchOperationVo) {
+        List<Integer> dormitoryIds = batchOperationVo.getDormitoryIds();
+        LambdaQueryWrapper<WelcomeDormitory> wrapper=new LambdaQueryWrapper<>();
+        wrapper.in(WelcomeDormitory::getId,dormitoryIds);
+        List<WelcomeDormitory> list = welcomeDormitoryService.list(wrapper);
+        if (ObjectUtils.isNotEmpty(list)) {
+            for (WelcomeDormitory welcomeDormitory : list) {
+                welcomeDormitory.setRetentionState(batchOperationVo.getRetentionState());
+            }
+            welcomeDormitoryService.updateBatchById(list);
+        }
+        return CommonResult.ok();
+    }
+
 }
 

src/main/java/com/template/model/pojo/WelcomeBed.java

@@ -88,6 +88,9 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "专业")
     private String major;
 
+    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    private Integer retentionState;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 

src/main/java/com/template/model/pojo/WelcomeDormitory.java

@@ -76,6 +76,9 @@ public class WelcomeDormitory implements Serializable {
     @ApiModelProperty(value = "空闲床位数")
     private Integer freeBedNumber;
 
+    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    private Integer retentionState;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

src/main/java/com/template/model/vo/BatchOperationVo.java

@@ -0,0 +1,16 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BatchOperationVo {
+
+    @ApiModelProperty(value = "宿舍id")
+    private List<Integer> dormitoryIds;
+
+    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    private Integer retentionState;
+}

src/main/java/com/template/model/vo/WelcomeDormitoryVo.java

@@ -48,4 +48,7 @@ public class WelcomeDormitoryVo {
 
     @ApiModelProperty(value = "空闲床位数")
     private Integer freeBedNumber;
+
+    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    private Integer retentionState;
 }

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

@@ -122,7 +122,8 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(WelcomeBed::getSchoolId, schoolId)
                 .eq(WelcomeBed::getBuildId, buildId)
                 .eq(WelcomeBed::getDormitoryId, dormitoryId)
-                .eq(WelcomeBed::getIsCheck, 0);
+                .eq(WelcomeBed::getIsCheck, 0)
+                .eq(WelcomeBed::getRetentionState,1);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
 

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

@@ -85,7 +85,8 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
     public List<WelcomeDormitory> dormitoryGroup(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)
+                .eq(WelcomeDormitory::getRetentionState,1);
         List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
         return welcomeDormitories;
     }

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

@@ -18,7 +18,8 @@
         wd.bed_number as bedNumber,
         wd.remark,
         wd.status,
-        wd.free_bed_number as freeBedNumber
+        wd.free_bed_number as freeBedNumber,
+        wd.retention_state as retentionState
         FROM
         `welcome_dormitory` wd
         LEFT JOIN welcome_school ws ON wd.school_id = ws.id and ws.deleted = 0