From 273f46b841e5c7db61855d444e1b95f2ce4f3dc1 Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Wed, 3 Jun 2026 16:30:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/deviceledger/vo/DeviceLedgerRespVO.java | 3 ++- .../dal/mysql/deviceledger/DeviceLedgerMapper.java | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java index 810217f69..9fdbc9fa2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/vo/DeviceLedgerRespVO.java @@ -177,7 +177,8 @@ public class DeviceLedgerRespVO extends BaseDO { private String templateJson; @Schema(description = "出厂日期") - private LocalDateTime outgoingTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate outgoingTime; @Schema(description = "序列号") private String sn; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java index 80aa5b52b..aff40f994 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/deviceledger/DeviceLedgerMapper.java @@ -23,9 +23,19 @@ public interface DeviceLedgerMapper extends BaseMapperX { default PageResult selectPage(DeviceLedgerPageReqVO reqVO) { LambdaQueryWrapperX deviceLedgerDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); + if(StringUtils.isNotBlank(reqVO.getDeviceCode())&&StringUtils.isNotBlank(reqVO.getDeviceName())&&reqVO.getDeviceCode().equals(reqVO.getDeviceName())){ + deviceLedgerDOLambdaQueryWrapperX.and(w -> w + .like(DeviceLedgerDO::getDeviceCode, reqVO.getDeviceCode()) + .or() + .like(DeviceLedgerDO::getDeviceName, reqVO.getDeviceName()) + ); + }else{ + deviceLedgerDOLambdaQueryWrapperX.likeIfPresent(DeviceLedgerDO::getDeviceCode, reqVO.getDeviceCode()) + .likeIfPresent(DeviceLedgerDO::getDeviceName, reqVO.getDeviceName()); + } deviceLedgerDOLambdaQueryWrapperX - .likeIfPresent(DeviceLedgerDO::getDeviceCode, reqVO.getDeviceCode()) - .likeIfPresent(DeviceLedgerDO::getDeviceName, reqVO.getDeviceName()) + /* .likeIfPresent(DeviceLedgerDO::getDeviceCode, reqVO.getDeviceCode()) + .likeIfPresent(DeviceLedgerDO::getDeviceName, reqVO.getDeviceName())*/ .likeIfPresent(DeviceLedgerDO::getSn, reqVO.getSn()) .eqIfPresent(DeviceLedgerDO::getDeviceStatus, reqVO.getDeviceStatus()) .eqIfPresent(DeviceLedgerDO::getDeviceBrand, reqVO.getDeviceBrand())