Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

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

@@ -764,7 +764,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             }else {
                 bl="是";
             }
-            dataRow.createCell(15).setCellValue(bed.getRetentionState());
+            dataRow.createCell(15).setCellValue(bl);
 
         }
         // 将工作簿写入文件

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

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