优化

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

@@ -618,7 +618,20 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         if (ObjectUtils.isNotEmpty(one)) {
             return CommonResult.fail("已提交,请勿重复提交");
         }
-        welcomeBedService.updateById(welcomeBed);
+
+        WelcomeBed wb = welcomeBedService.getBedById(welcomeBed.getId());
+        if(wb == null){
+            return CommonResult.fail("床位已失效，选择失败！");
+        }
+
+        if(StringUtils.hasText(wb.getStudentCard()) && !wb.getStudentCard().equals(welcomeBed.getStudentCard())){
+            return CommonResult.fail("该床位已被其他人入住，选择失败！");
+        }
+
+        boolean updateBed = welcomeBedService.updateById(welcomeBed);
+        if(!updateBed){
+            return CommonResult.fail("选宿舍失败");
+        }
         return CommonResult.ok();
     }
 

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

@@ -74,6 +74,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
     private WelcomeBedService welcomeBedService;
 
     @Autowired
+    private WelcomeSettingService welcomeSettingService;
+
+    @Autowired
     private WelcomeArriveSettingService welcomeArriveSettingService;
 
     @Autowired
@@ -1373,8 +1376,12 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
 
     @Override
     public CommonResult studentOverview() {
+
+        QueryWrapper<WelcomeStudent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("iden_type",1);
+        queryWrapper.eq("fill_status","已填报");
 //        报到总数
-        int studentTotal = welcomeStudentService.count(new QueryWrapper<>());
+        int studentTotal = welcomeStudentService.count(queryWrapper);
 //        寝室总数
         int dormitoryTotal = welcomeDormitoryService.count(new QueryWrapper<>());
 
@@ -1388,7 +1395,8 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         LocalDateTime end = start.plusDays(1);
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         Integer visitorTotal=welcomeVisitorService.countTotal(start,end);
-        Integer carTotal = welcomeVisitorService.carTotal();
+        List<WelcomeSetting> wss = welcomeSettingService.list(null);
+        Integer carTotal =wss !=null && wss.size() > 0 ? wss.get(0).getCarNum() : 0;
 
         StudentOverviewVo vo = new StudentOverviewVo();
         vo.setEnrollmentTotal(6532);

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

@@ -1,7 +1,6 @@
 package com.template.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <p>
@@ -68,4 +68,5 @@ public class WelcomeVisitor implements Serializable {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
 }