chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,20 @@ public interface OrderDeviceService
* @param id 订单设备主键 * @param id 订单设备主键
* @return 订单设备 * @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);
/** /**
* 查询订单设备列表 * 查询订单设备列表

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

@ -51,13 +51,20 @@ public class OrderDeviceServiceImpl implements OrderDeviceService
/** /**
* 查询订单设备 * 查询订单设备
* *
* @param id 订单设备主键 * @param id 订单设备主键
* @param scope
* @return 订单设备 * @return 订单设备
*/ */
@Override @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);
} }
/** /**

4
ruoyi-web/src/main/java/com/ruoyi/web/bst/OrderDeviceController.java
View File

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