diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java index 06765bc9..f6fdc3d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java @@ -157,7 +157,7 @@ public class BaseCarController extends BaseController @PostMapping("/PdaQueryCarList") @ResponseBody - public AjaxResult PdaQueryCarList(BaseCar baseCar) + public AjaxResult PdaQueryCarList(@RequestBody BaseCar baseCar) { List list = baseCarService.selectBaseCarList(baseCar); if (list == null || list.isEmpty()){ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java index 91fc9391..81cd195e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseTyre.java @@ -79,7 +79,6 @@ public class BaseTyre extends BaseEntity @Excel(name = "所在轮位") private String wheelPostion; - private String pressure; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java index 50ca033e..c4ec6e0b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseTyreServiceImpl.java @@ -294,7 +294,7 @@ public class BaseTyreServiceImpl implements IBaseTyreService for (BizOrderTireDetail biz : bizOrderTireDetailList){ //查询维修单//筛选工单 List filteredList = bizOrderTireDetailList.stream() - .filter(detail -> detail.getOrderId() == biz.getOrderId()) // 假设 orderId 是 int 类型 + .filter(detail -> detail.getOrderId() == biz.getOrderId()) .collect(Collectors.toList()); BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderMapper.selectBizMaintenanceOrderByOrderId(biz.getOrderId()); bizMaintenanceOrder.setBizOrderTireDetailList(filteredList);