fix

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMeetingRoomScheduleController.java

@@ -16,9 +16,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.business.dto.BusMeetingRoomScheduleDetailDto;
 import org.jeecg.modules.business.dto.BusMeetingRoomScheduleDto;
 import org.jeecg.modules.business.entity.*;
-import org.jeecg.modules.business.service.IBusMeetingRoomScheduleDetailService;
-import org.jeecg.modules.business.service.IBusMeetingRoomScheduleOrderDetailService;
-import org.jeecg.modules.business.service.IBusRoomPayTypeService;
+import org.jeecg.modules.business.service.*;
 import org.jeecg.modules.business.service.impl.BusMeetingRoomScheduleServiceImpl;
 import org.jeecg.modules.business.service.impl.BusMeetingRoomServiceImpl;
 import org.springframework.web.bind.annotation.*;
@@ -52,6 +50,10 @@ public class BusMeetingRoomScheduleController {
     private IBusMeetingRoomScheduleDetailService busMeetingRoomScheduleDetailService;
     @Resource
     private IBusRoomPayTypeService busRoomPayTypeService;
+    @Resource
+    private IBusRoomsLivingOrderService busRoomsLivingOrderService;
+    @Resource
+    private IBusCustomerService busCustomerService;
 
     @ApiOperation(value="创建会议预定", notes="创建会议预定")
     @PostMapping(value = "/create")
@@ -168,6 +170,15 @@ public class BusMeetingRoomScheduleController {
             lambdaQueryWrapper2.eq(BusMeetingRoomScheduleDetail::getStatus, 0);
             Long count = busMeetingRoomScheduleDetailService.count(lambdaQueryWrapper2);
             item.setConfirmStatus(count > 0 ? 0 : 1);
+            if (StringUtils.isNotBlank(item.getSettleRoomOrderNo())) {
+                BusRoomsLivingOrder order = busRoomsLivingOrderService.getById(item.getSettleRoomOrderNo());
+                if (order != null) {
+                    BusCustomer busCustomer = busCustomerService.getById(order.getContactId());
+                    if (busCustomer != null) {
+                        item.setContactName(busCustomer.getName());
+                    }
+                }
+            }
         });
         return Result.OK(pageList);
     }

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

@@ -145,4 +145,6 @@ public class BusMeetingRoomSchedule extends Model<BusMeetingRoomSchedule> {
     private List<BusRoomPayType> paymentMethodList;
     @TableField(exist = false)
     private BigDecimal preferentialAmount;
+    @TableField(exist = false)
+    private String contactName;
 }