From 7eec67a7c93969705b5719d27c93ded696693ff6 Mon Sep 17 00:00:00 2001 From: wanghao Date: Sun, 19 Apr 2026 18:12:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E5=8D=95):=20=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=A1=E6=81=AF=E8=BD=A6=E7=89=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/tyre/BaseCarController.java | 5 ++++- .../system/service/impl/BaseCarServiceImpl.java | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) 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 c00e7174..51149ba5 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 @@ -147,9 +147,12 @@ public class BaseCarController extends BaseController @PostMapping("/PdaQueryCarList") @ResponseBody - public AjaxResult PdaQueryCarList(@RequestBody BaseCar baseCar) + public AjaxResult PdaQueryCarList(BaseCar baseCar) { List list = baseCarService.selectBaseCarList(baseCar); + if (list == null || list.isEmpty()){ + return AjaxResult.error("查询到的车辆基础信息为空"); + } return AjaxResult.success(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseCarServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseCarServiceImpl.java index 4012f8a7..b44a7c41 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseCarServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseCarServiceImpl.java @@ -61,9 +61,20 @@ public class BaseCarServiceImpl implements IBaseCarService @DataScope(deptAlias = "d", userAlias = "u") public List selectBaseCarList(BaseCar baseCar) { + + String carNo = baseCar.getCarNo(); + baseCar.setCarNo(buildLikePattern(carNo)); return baseCarMapper.selectBaseCarList(baseCar); } - + public static String buildLikePattern(String input) { + if (input == null || input.isEmpty()) { + return "%"; + } + return "%" + input.chars() + .mapToObj(c -> String.valueOf((char) c)) + .reduce((a, b) -> a + "%" + b) + .orElse("") + "%"; + } /** * 新增车辆基础信息 *