From a44dc9d16eee18b88d26c5dd7d516a95417c72ec Mon Sep 17 00:00:00 2001 From: zhangjunwen Date: Tue, 5 Nov 2024 15:12:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E8=AE=BE=E5=A4=87=E8=B6=8B=E5=8A=BF?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/controller/equip/vo/EquipInfoPageReqVO.java | 3 +++ .../inspur/module/system/dal/mysql/equip/EquipInfoMapper.java | 1 + 2 files changed, 4 insertions(+) diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java index 8c8a98f..7ba154f 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/equip/vo/EquipInfoPageReqVO.java @@ -19,6 +19,9 @@ public class EquipInfoPageReqVO extends PageParam { @Schema(description = "机床设备编号") private String equipNo; + @Schema(description = "机床设备名称") + private String equipName; + @Schema(description = "机床状态") private Integer status; diff --git a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java index 3681afa..10588be 100644 --- a/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java +++ b/imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java @@ -27,6 +27,7 @@ public interface EquipInfoMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(EquipInfoDO::getModelId, reqVO.getModelId()) .eqIfPresent(EquipInfoDO::getCustomerId, reqVO.getCustomerId()) + .likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName()) .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo()) .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus()) .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)