master
杨万里 2 days ago
parent cfa26ec9c2
commit 2f61bcd54d

@ -157,7 +157,7 @@ public class BaseCarController extends BaseController
@PostMapping("/PdaQueryCarList") @PostMapping("/PdaQueryCarList")
@ResponseBody @ResponseBody
public AjaxResult PdaQueryCarList(BaseCar baseCar) public AjaxResult PdaQueryCarList(@RequestBody BaseCar baseCar)
{ {
List<BaseCar> list = baseCarService.selectBaseCarList(baseCar); List<BaseCar> list = baseCarService.selectBaseCarList(baseCar);
if (list == null || list.isEmpty()){ if (list == null || list.isEmpty()){

@ -79,7 +79,6 @@ public class BaseTyre extends BaseEntity
@Excel(name = "所在轮位") @Excel(name = "所在轮位")
private String wheelPostion; private String wheelPostion;
private String pressure;
/** /**

@ -294,7 +294,7 @@ public class BaseTyreServiceImpl implements IBaseTyreService
for (BizOrderTireDetail biz : bizOrderTireDetailList){ for (BizOrderTireDetail biz : bizOrderTireDetailList){
//查询维修单//筛选工单 //查询维修单//筛选工单
List<BizOrderTireDetail> filteredList = bizOrderTireDetailList.stream() List<BizOrderTireDetail> filteredList = bizOrderTireDetailList.stream()
.filter(detail -> detail.getOrderId() == biz.getOrderId()) // 假设 orderId 是 int 类型 .filter(detail -> detail.getOrderId() == biz.getOrderId())
.collect(Collectors.toList()); .collect(Collectors.toList());
BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderMapper.selectBizMaintenanceOrderByOrderId(biz.getOrderId()); BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderMapper.selectBizMaintenanceOrderByOrderId(biz.getOrderId());
bizMaintenanceOrder.setBizOrderTireDetailList(filteredList); bizMaintenanceOrder.setBizOrderTireDetailList(filteredList);

Loading…
Cancel
Save