实时房态，添加团队信息

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomsLivingOrder.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -201,6 +199,8 @@ public class BusRoomsLivingOrder implements Serializable {
     @ApiModelProperty(value = "批次id")
     private String batchId;
 
+    @TableField(exist = false)
+    private Boolean isTeam;
 
 
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesRoomsController.java

@@ -15,6 +15,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.modules.business.entity.BusRoomBookingOrders;
+import org.jeecg.modules.business.entity.BusRoomsLivingOrder;
 import org.jeecg.modules.business.entity.BusTeam;
 import org.jeecg.modules.business.service.IBusRoomBookingOrdersService;
 import org.jeecg.modules.business.service.IBusTeamService;
@@ -99,6 +100,9 @@ public class CesRoomsController {
             List<FloorBuildingRoomVo> otherInfos = bookingOrdersService.getRealtimeInfo(allRooms);
             List<String> bookingOrderIds = new ArrayList<>();
             otherInfos.forEach(c->{
+                if(c.getLivingData().getLivingOrder() != null) {
+                    bookingOrderIds.add(c.getLivingData().getLivingOrder().getBookingOrderId());
+                }
                 if(c.getBookingData().getBookingOrder() != null) {
                     bookingOrderIds.add(c.getBookingData().getBookingOrder().getId());
                 }
@@ -125,6 +129,13 @@ public class CesRoomsController {
                                 opFindRoomVo.get().getBookingData().getBookingOrder().setIsTeam(true);
                             }
                         }
+                        if(opFindRoomVo.get().getLivingData().getLivingOrder() != null) {
+                            BusRoomsLivingOrder livingOrder = opFindRoomVo.get().getLivingData().getLivingOrder();
+                            Optional<BusTeam> opTeam = teamOrders.stream().filter(r->r.getBookingOrderId().equals(livingOrder.getBookingOrderId())).findFirst();
+                            if(opTeam.isPresent()) {
+                                opFindRoomVo.get().getLivingData().getLivingOrder().setIsTeam(true);
+                            }
+                        }
                         roomVo.setBookingData(opFindRoomVo.get().getBookingData());
                     }
                     roomInfos.add(roomVo);