更新

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

@@ -32,7 +32,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/queryPageBeds")
     @ApiOperation(value = "床位信息分页数据", notes = "床位信息分页数据", httpMethod = "GET")
-    CommonResult queryPageBeds(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId);
+    CommonResult queryPageBeds(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState);
 
     @GetMapping(value = "/deleteBedInfo")
     @ApiOperation(value = "删除床位信息", notes = "删除床位信息", httpMethod = "GET")

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

@@ -31,7 +31,7 @@ public interface WelcomeDormitoryControllerAPI {
 
     @GetMapping(value = "/listDormitory")
     @ApiOperation(value = "查询寝室", notes = "查询寝室", httpMethod = "GET")
-    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId);
+    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId,Integer retentionState);
 
 
     @GetMapping(value = "/dormitoryGroup")

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

@@ -168,8 +168,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
-        PageUtils<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId);
+    public CommonResult queryPageBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
+        PageUtils<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
         return CommonResult.ok(result);
     }
 
@@ -602,7 +602,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
     @Override
     public CommonResult downloadBedExcel() {
-        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/alumnus/home/image/床位信息管理.xlsx");
+        return CommonResult.ok("200", "操作成功", "https://chtech.ncjti.edu.cn/welcome/homeimage/床位信息管理.xlsx");
     }
 
     @Override
@@ -670,6 +670,9 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (wb == null) {
             return CommonResult.fail("床位已失效，选择失败！");
         }
+        if (wb.getIsCheck()==1) {
+            return CommonResult.fail("该床位已被其他人入住");
+        }
 
         if (StringUtils.hasText(wb.getStudentCard()) && !wb.getStudentCard().equals(welcomeBed.getStudentCard())) {
             return CommonResult.fail("该床位已被其他人入住，选择失败！");
@@ -759,6 +762,10 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(bed)) {
             return CommonResult.fail("不存在该床铺");
         }
+        if (bed.getIsCheck()==1) {
+            return CommonResult.fail("该床位已被其他人入住");
+        }
+
         bed.setIsCheck(1);
         bed.setStudentCard(welcomeStudent.getCardId());
         bed.setCardNum(welcomeStudent.getAdmissNum());
@@ -904,6 +911,15 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isEmpty(sourceBed) || ObjectUtils.isEmpty(changeBed)) {
             return CommonResult.fail("床位不存在");
         }
+        String studentCard = sourceBed.getStudentCard();
+        String cardNum = sourceBed.getCardNum();
+        Integer classstrId = sourceBed.getClassstrId();
+        String classstr = sourceBed.getClassstr();
+        String name = sourceBed.getName();
+        Integer majorId = sourceBed.getMajorId();
+        sourceBed.getMajor();
+//        welcomeBeds.add(changeBed);
+
         return null;
     }
 }

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

@@ -231,9 +231,9 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId) {
+    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId,Integer retentionState) {
 
-        PageUtils<WelcomeDormitoryVo> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, status, majorId, collegeId);
+        PageUtils<WelcomeDormitoryVo> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, status, majorId, collegeId,retentionState);
 
         if (pageUtils != null && pageUtils.getList() != null && pageUtils.getList().size() > 0) {
             List<Integer> dormitoryIds = pageUtils.getList().stream().map(WelcomeDormitoryVo::getId).collect(Collectors.toList());
@@ -371,7 +371,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         if (!sex.equals("寝室性别")) {
                             return CommonResult.fail("导入数据第五列为寝室性别");
                         }
-                        String grade = dataFormatter.formatCellValue(row.getCell(5));//所属专业
+                        String grade = dataFormatter.formatCellValue(row.getCell(5));//所属年级
                         if (!grade.equals("所属年级")) {
                             return CommonResult.fail("导入数据第六列为所属年级");
                         }

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

@@ -25,7 +25,7 @@ public interface WelcomeDormitoryMapper extends BaseMapper<WelcomeDormitory> {
 
     IPage<WelcomeDormitoryVo> listDormitory(Page<WelcomeDormitoryVo> page, @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
                                             @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("status") Integer status,
-                                            @Param("majorId") Integer majorId, @Param("collegeId") Integer collegeId);
+                                            @Param("majorId") Integer majorId, @Param("collegeId") Integer collegeId,@Param("retentionState") Integer retentionState);
 
 
     List<WelcomeDormitoryVo> listDormitory( @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,

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

@@ -91,7 +91,7 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "专业")
     private String major;
 
-    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    @ApiModelProperty(value = "保留状态 1:开发，2保留")
     private Integer retentionState;
 
     @ApiModelProperty(value = "备注")

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

@@ -73,7 +73,7 @@ public class WelcomeDormitory implements Serializable {
     @ApiModelProperty(value = "空闲床位数")
     private Integer freeBedNumber;
 
-    @ApiModelProperty(value = "保留状态 1:保留，0不保留")
+    @ApiModelProperty(value = "保留状态 1:开发，2保留")
     private Integer retentionState;
 
     @ApiModelProperty(value = "创建时间")

src/main/java/com/template/model/request/InsertWelcomeBedRequest.java

@@ -74,4 +74,13 @@ public class InsertWelcomeBedRequest implements Serializable {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "保留状态 1:开发，2保留")
+    private Integer retentionState;
+
+    @ApiModelProperty(value = "所属年级")
+    private Integer grade;
+
+    @ApiModelProperty(value = "辅导员")
+    private String instructor;
 }

src/main/java/com/template/model/request/UpdateWelcomeBedRequest.java

@@ -74,4 +74,13 @@ public class UpdateWelcomeBedRequest implements Serializable {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "保留状态 1:开发，2保留")
+    private Integer retentionState;
+
+    @ApiModelProperty(value = "所属年级")
+    private Integer grade;
+
+    @ApiModelProperty(value = "辅导员")
+    private String instructor;
 }

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

@@ -22,7 +22,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     int updateWelcomeBed(WelcomeBed rns);
 
-    PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId);
+    PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState);
 
     int deleteWelcomeBedById(int id);
 

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

@@ -29,7 +29,7 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
     WelcomeDormitory getManageById(String id);
 
 
-    PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId);
+    PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId,Integer retentionState);
 
     List<WelcomeDormitoryVo> listDormitory(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId);
 

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

@@ -46,7 +46,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
+    public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
@@ -57,6 +57,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(collegeId != null, "college_id", collegeId);
         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");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page, queryWrapper);
         return new PageUtils<>(result);

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

@@ -68,9 +68,9 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
 
 
     @Override
-    public PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId) {
+    public PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId,Integer retentionState) {
         Page<WelcomeDormitoryVo> page = new Page<>(currentPage, pageCount);
-        IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitory(page,schoolId,buildId,dormitoryId,sex,status,majorId,collegeId);
+        IPage<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitory(page,schoolId,buildId,dormitoryId,sex,status,majorId,collegeId,retentionState);
         return new PageUtils<>(result);
     }
 

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

@@ -47,6 +47,9 @@
         <if test="collegeId != null and collegeId != ''">
             and wd.college_id = #{collegeId}
         </if>
+        <if test="retentionState != null and retentionState != ''">
+            and wd.retention_state = #{retentionState}
+        </if>
         order by wd.create_time desc
     </select>
     <select id="getTotalCount" resultType="com.template.model.vo.StudentStayVo">