debug

ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/service/OrderDeviceService.java

@@ -21,7 +21,20 @@ public interface OrderDeviceService
      * @param id 订单设备主键
      * @return 订单设备
      */
-    public OrderDeviceVO selectOrderDeviceById(Long id);
+
+    default OrderDeviceVO selectOrderDeviceById(Long id) {
+        return selectOrderDeviceById(id, false);
+    }
+
+    /**
+     * 查询订单设备
+     *
+     * @param id    订单设备主键
+     * @param scope
+     * @return 订单设备
+     */
+
+    public OrderDeviceVO selectOrderDeviceById(Long id, boolean scope);
 
     /**
      * 查询订单设备列表

ruoyi-service/src/main/java/com/ruoyi/bst/orderDevice/service/impl/OrderDeviceServiceImpl.java

@@ -51,13 +51,20 @@ public class OrderDeviceServiceImpl implements OrderDeviceService
     /**
      * 查询订单设备
      *
-     * @param id 订单设备主键
+     * @param id    订单设备主键
+     * @param scope
      * @return 订单设备
      */
     @Override
-    public OrderDeviceVO selectOrderDeviceById(Long id)
+    public OrderDeviceVO selectOrderDeviceById(Long id, boolean scope)
     {
-        return orderDeviceMapper.selectOrderDeviceById(id);
+        if (id == null) {
+            return null;
+        }
+        OrderDeviceQuery query = new OrderDeviceQuery();
+        query.setId(id);
+        query.setScope(scope);
+        return this.selectOne(query);
     }
 
     /**
@@ -84,17 +91,17 @@ public class OrderDeviceServiceImpl implements OrderDeviceService
         Integer result = transactionTemplate.execute(status -> {
 
             int rows = orderDeviceMapper.insertOrderDevice(orderDevice);
-            
+
             if (rows > 0) {
                 // 修改订单信息
                 int updateOrder = orderService.updateOrderDeviceId(orderDevice.getOrderId(), orderDevice.getId());
                 ServiceUtil.assertion(updateOrder != 1, "更新订单信息失败");
-    
+
                 // 修改设备信息
                 int updateDevice = deviceService.updateCurrentDeviceOrderId(orderDevice.getDeviceId(), orderDevice.getId());
                 ServiceUtil.assertion(updateDevice != 1, "占用设备失败，当前设备有他人使用，请尝试其他设备。");
             }
-            
+
             return rows;
         });
 
@@ -189,7 +196,7 @@ public class OrderDeviceServiceImpl implements OrderDeviceService
     public int finish(OrderDeviceVO orderDevice, String picture, OrderInParkingVO inParkingVO) {
         ServiceUtil.assertion(orderDevice == null, "订单设备不能为空");
         ServiceUtil.assertion(!OrderDeviceStatus.canFinish().contains(orderDevice.getStatus()), "订单设备状态不允许结束");
-        
+
         Integer result = transactionTemplate.execute(status -> {
             // 修改数据
             OrderDevice data = new OrderDevice();

ruoyi-web/src/main/java/com/ruoyi/web/bst/OrderDeviceController.java

@@ -44,6 +44,7 @@ public class OrderDeviceController extends BaseController
     {
         startPage();
         startOrderBy();
+        query.setScope(true);
         List<OrderDeviceVO> list = orderDeviceService.selectOrderDeviceList(query);
         return getDataTable(list);
     }
@@ -56,6 +57,7 @@ public class OrderDeviceController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, OrderDeviceQuery query)
     {
+        query.setScope(true);
         List<OrderDeviceVO> list = orderDeviceService.selectOrderDeviceList(query);
         ExcelUtil<OrderDeviceVO> util = new ExcelUtil<OrderDeviceVO>(OrderDeviceVO.class);
         util.exportExcel(response, list, "订单设备数据");
@@ -68,7 +70,7 @@ public class OrderDeviceController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(orderDeviceService.selectOrderDeviceById(id));
+        return success(orderDeviceService.selectOrderDeviceById(id, true));
     }
 
 }