This commit is contained in:
磷叶 2025-04-19 19:50:50 +08:00
parent 3b2bfd50d5
commit a19a7a91a1
3 changed files with 31 additions and 9 deletions

View File

@ -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);
/**
* 查询订单设备列表

View File

@ -52,12 +52,19 @@ public class OrderDeviceServiceImpl implements OrderDeviceService
* 查询订单设备
*
* @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);
}
/**

View File

@ -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));
}
}