更新

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

@@ -1509,9 +1509,9 @@ public class WelcomeStudentController implements WelcomeStudentControllerAPI {
         vo.setPayCount(payCount);
         vo.setCheckInBedTotal(checkInBedTotal);
         vo.setRegistrationRate(registrationRate);
-        vo.setHCarTotal(hCarTotal);
+        vo.setHCarTotal(hCarTotal-hVisitorTotal);
         vo.setHVisitorTotal(hVisitorTotal);
-        vo.setMCarTotal(mCarTotal);
+        vo.setMCarTotal(mCarTotal-mVisitorTotal);
         vo.setMVisitorTotal(mVisitorTotal);
         return CommonResult.ok(vo);
     }

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

@@ -16,16 +16,16 @@ public class StudentOverviewVo {
     //报到率
     private Double registrationRate;
 
-    //当天墨轩湖车牌数
+    //当天墨轩湖预定车牌数
     private Integer mVisitorTotal;
 
-    //当天墨轩湖车牌数
+    //当天墨轩湖剩余总车牌数
     private Integer mCarTotal;
 
-    //当天黄家湖车牌数
+    //当天黄家湖预定车牌数
     private Integer hVisitorTotal;
 
-    //当天黄家湖车牌数
+    //当天黄家湖剩余总车牌数
     private Integer hCarTotal;
 
 }

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

@@ -256,8 +256,8 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
     @Override
     public Integer countTotal(LocalDateTime start, LocalDateTime end,Integer schoolId) {
         LambdaQueryWrapper<WelcomeVisitor> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.ge(WelcomeVisitor::getStartTime, start)
-                        .le(WelcomeVisitor::getEndTime,end)
+        queryWrapper.le(WelcomeVisitor::getStartTime, start)
+                        .ge(WelcomeVisitor::getEndTime,end)
                 .eq(WelcomeVisitor::getSchoolId,schoolId);
         int count = this.count(queryWrapper);
         return count;