From ac4e0810708771b90e8e5b668dcaabf49d038781 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 26 Jun 2026 13:58:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A1=B5=E9=9D=A2bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/controller/HardApptController.java        |  2 +-
 .../hard/controller/order/HardOrderController.java |  3 ---
 .../bsd/pjcloud/hard/service/HardApptService.java  |  5 +++++
 .../hard/service/impl/HardApptServiceImpl.java     | 14 ++++++++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardApptController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardApptController.java
index a0c75441f..165e7c173 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardApptController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/HardApptController.java
@@ -117,7 +117,7 @@ public class HardApptController {
     @GetMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('hard_hardAppt_view')")
     public R getById(@PathVariable("id") Long id) {
-        return R.ok(hardApptService.getById(id));
+        return R.ok(hardApptService.join(id));
     }
 
     @Operation(summary = "新增设备预约管理", description = "新增设备预约管理")
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
index f100180d0..d46a1ca93 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
@@ -80,9 +80,6 @@ import java.util.Map;
 
 /**
  * 订单表
- *
- * @author dzc
- * @date 2025-01-05 16:46:25
  */
 @RestController
 @RequiredArgsConstructor
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardApptService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardApptService.java
index 6a7e63e97..81d24c2ef 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardApptService.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardApptService.java
@@ -34,4 +34,9 @@ public interface HardApptService extends IService<HardApptEntity> {
     Page<HardApptVo> scopePage(Page page, HardApptDto dto, DataScope of);
 
     List<HardApptVo> scopeList(HardApptDto dto, DataScope of);
+
+    /**
+     * 查询详情
+     */
+    HardApptVo join(Long id);
 }
\ No newline at end of file
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardApptServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardApptServiceImpl.java
index 724fe0d5a..1d77a5f28 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardApptServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardApptServiceImpl.java
@@ -120,6 +120,20 @@ public class HardApptServiceImpl extends ServiceImpl<HardApptMapper, HardApptEnt
         return resultList;
     }
 
+    /**
+     * 查询详情
+     */
+    @Override
+    public HardApptVo join(Long id) {
+        HardApptEntity hardAppt = baseMapper.selectById(id);
+        if (ObjectUtil.isEmpty(hardAppt)) {
+            throw new RuntimeException("时间预约不存在");
+        }
+        List<HardApptVo> resultList = List.of(BeanUtil.toBean(hardAppt, HardApptVo.class));
+        disposePageList(resultList);
+        return resultList.get(0);
+    }
+
     // 创建预约时间
     private void createApptTime(HardApptEntity apptEntity, List<String> reserveTimeList) {
         if (!ObjectUtil.isAllNotEmpty(apptEntity.getId(), apptEntity.getMchId(), reserveTimeList)) {