liu 1 year ago
parent
commit
6571e6cc98

+ 11 - 0
src/main/java/com/template/api/WelcomeBedControllerAPI.java

@@ -6,6 +6,9 @@ import com.template.model.request.InfoCollectionRequest;
 import com.template.model.request.InsertWelcomeBedRequest;
 import com.template.model.request.UpdateWelcomeBedRequest;
 import com.template.model.result.CommonResult;
+import com.template.model.vo.BatchOperationBedVo;
+import com.template.model.vo.BatchOperationVo;
+import com.template.model.vo.CheckInVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
@@ -65,4 +68,12 @@ public interface WelcomeBedControllerAPI {
     @ApiOperation(value = "判断是否入住", notes = "判断是否入住", httpMethod = "GET")
     CommonResult isCheck(@RequestAttribute String studentCard);
 
+    @PostMapping(value = "/batchOperationBed")
+    @ApiOperation(value = "批量操作是否保留", notes = "批量操作是否保留", httpMethod = "POST")
+    CommonResult batchOperationBed(@RequestBody BatchOperationBedVo batchOperationVo);
+
+    @PostMapping(value = "/checkIn")
+    @ApiOperation(value = "入住", notes = "入住", httpMethod = "POST")
+    CommonResult checkIn(@RequestBody CheckInVo checkInVo);
+
 }

+ 39 - 4
src/main/java/com/template/controller/WelcomeBedController.java

@@ -14,10 +14,7 @@ import com.template.model.request.InsertWelcomeBedRequest;
 import com.template.model.request.UpdateWelcomeBedRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.BedDetailsVo;
-import com.template.model.vo.ListVo;
-import com.template.model.vo.StudentPageVo;
-import com.template.model.vo.WelcomeBedCheckVo;
+import com.template.model.vo.*;
 import com.template.services.*;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -684,5 +681,43 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         }
         return CommonResult.ok(vo);
     }
+
+    @Override
+    public CommonResult batchOperationBed(BatchOperationBedVo batchOperationVo) {
+        List<Integer> bedIds = batchOperationVo.getBedIds();
+        LambdaQueryWrapper<WelcomeBed> wrapper=new LambdaQueryWrapper<>();
+        wrapper.in(WelcomeBed::getId,bedIds);
+        List<WelcomeBed> list = welcomeBedService.list(wrapper);
+        if (ObjectUtils.isNotEmpty(list)) {
+            for (WelcomeBed welcomeBed : list) {
+                welcomeBed.setRetentionState(batchOperationVo.getRetentionState());
+            }
+            welcomeBedService.updateBatchById(list);
+        }
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult checkIn(CheckInVo checkInVo) {
+        List<WelcomeStudent> list=welcomeStudentService.getStudent(checkInVo);
+        if (ObjectUtils.isEmpty(list)) {
+            return CommonResult.fail("暂无该学生");
+        }else if (list.size()>1){
+            return CommonResult.fail("该录取号有多个学生,请检查修改后在试");
+        }
+        WelcomeStudent welcomeStudent = list.get(0);
+        WelcomeBed bed = welcomeBedService.getBedById(checkInVo.getBedId());
+        if (ObjectUtils.isEmpty(bed)) {
+            return CommonResult.fail("不存在该床铺");
+        }
+        bed.setIsCheck(1);
+        bed.setStudentCard(welcomeStudent.getCardId());
+        bed.setCardNum(welcomeStudent.getAdmissNum());
+        bed.setClassstrId(welcomeStudent.getClassstrId());
+        bed.setClassstr(welcomeStudent.getClassstr());
+        bed.setName(welcomeStudent.getName());
+        welcomeBedService.updateWelcomeBed(bed);
+        return CommonResult.ok();
+    }
 }
 

+ 15 - 0
src/main/java/com/template/model/vo/BatchOperationBedVo.java

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

+ 14 - 0
src/main/java/com/template/model/vo/CheckInVo.java

@@ -0,0 +1,14 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class CheckInVo {
+//    名字
+    private String name;
+//      录取号
+    private String admissNum;
+
+    private Integer bedId;
+
+}

+ 2 - 4
src/main/java/com/template/services/WelcomeStudentService.java

@@ -5,10 +5,7 @@ import com.template.model.pojo.WelcomeStudent;
 import com.template.model.pojo.WelcomeStudent;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.StudentPageVo;
-import com.template.model.vo.StudentRegisterVo;
-import com.template.model.vo.StudentSexRatioVo;
-import com.template.model.vo.StudentTrafficVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -58,4 +55,5 @@ public interface WelcomeStudentService extends IService<WelcomeStudent> {
 
     int payCount();
 
+    List<WelcomeStudent> getStudent(CheckInVo checkInVo);
 }

+ 11 - 4
src/main/java/com/template/services/impl/WelcomeStudentServiceImpl.java

@@ -11,10 +11,7 @@ import com.template.model.pojo.WelcomeStudent;
 import com.template.model.pojo.WelcomeStudent;
 import com.template.mapper.WelcomeStudentMapper;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.StudentPageVo;
-import com.template.model.vo.StudentRegisterVo;
-import com.template.model.vo.StudentSexRatioVo;
-import com.template.model.vo.StudentTrafficVo;
+import com.template.model.vo.*;
 import com.template.services.WelcomeStudentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -157,6 +154,16 @@ public class WelcomeStudentServiceImpl extends ServiceImpl<WelcomeStudentMapper,
     }
 
     @Override
+    public List<WelcomeStudent> getStudent(CheckInVo checkInVo) {
+        LambdaQueryWrapper<WelcomeStudent> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeStudent::getName,checkInVo.getName())
+                        .eq(WelcomeStudent::getAdmissNum,checkInVo.getAdmissNum())
+                .eq(WelcomeStudent::getIdenType,1);
+        List<WelcomeStudent> list = welcomeStudentMapper.selectList(wrapper);
+        return list;
+    }
+
+    @Override
     public WelcomeStudent getDataByIdcardOrNum(String admissNum, String cardId) {
         QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
         queryWrapper.and(e -> e.eq(StringUtils.hasText(admissNum), "admiss_num", admissNum)