Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai into develop-wxl

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

@@ -578,6 +578,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 LocalDateTime now = LocalDateTime.now();
                 if (now.isAfter(start)) {
                     localDateTime= now;
+                }else {
+                    localDateTime=start.plusDays(i);
                 }
             }else {
                 localDateTime = start.plusDays(i);

src/main/java/com/template/model/mqtt/MqttConfiguration.java

@@ -1,6 +1,5 @@
 package com.template.model.mqtt;
 
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,5 +36,6 @@ public class MqttConfiguration {
  
     @Value("${mqtt.qos}")
     private int qos;
+
     
 }

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

@@ -120,10 +120,11 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
             List<HousePrice> housePrices1 = housePriceService.getDatePrice(localDate1, houseId);
 
             if ("4".equals(department)) {
-                LocalDateTime endS = dateTime1.plusDays(i + 1);
+                LocalDateTime startS = dateTime1.withHour(0).withMinute(0).withSecond(0);
+                LocalDateTime endS = dateTime1.withHour(23).withMinute(59).withSecond(59);
                 LambdaQueryWrapper<ClassSchedule> wrapperCS = new LambdaQueryWrapper<>();
                 wrapperCS.eq(ClassSchedule::getJsgh, users.getCardNumber())
-                        .between(ClassSchedule::getDateTime, dateTime1, endS);
+                        .between(ClassSchedule::getDateTime, startS, endS);
                 List<ClassSchedule> scheduleList = classScheduleService.list(wrapperCS);
 
                 if (ObjectUtils.isEmpty(scheduleList)) {