From 2efc05d570d23d86b02b6fd8f73491b3d520bde0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 十月 2026 10:47:31 +0800
Subject: [PATCH] fix(mes-dv): 设备模块列表查询补充按创建时间降序排序
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
index 2a9fd51..1e8945c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
@@ -34,7 +34,6 @@
// 鍏宠仈鐗╂枡鍒嗙被锛屼粎鐢ㄤ簬鎺掑簭锛氬悓鍒嗙被鐨勭墿鏂欒仛鍦ㄤ竴璧凤紝鍒嗙被涔嬮棿鎸夊垎绫荤殑鏄剧ず鎺掑簭
query.leftJoin(MesMdItemTypeDO.class, MesMdItemTypeDO::getId, MesMdItemDO::getItemTypeId)
.likeIfPresent(MesMdItemDO::getCode, reqVO.getCode())
- .likeIfPresent(MesMdItemDO::getName, reqVO.getName())
.inIfPresent(MesMdItemDO::getItemTypeId, itemTypeIds)
.inIfPresent(MesMdItemDO::getId,
StrUtil.isBlank(reqVO.getIds()) ? null : StrUtils.splitToLong(reqVO.getIds(), ","))
@@ -43,6 +42,20 @@
.orderByAsc(MesMdItemTypeDO::getSort)
.orderByAsc(MesMdItemTypeDO::getCode)
.orderByAsc(MesMdItemDO::getCode);
+ if (StrUtil.isNotBlank(reqVO.getName())) {
+ String keyword = reqVO.getName().replaceAll("[\\s\\u3000-]+", "").replace("鍏�", "g");
+ if (keyword.isEmpty()) {
+ query.like(MesMdItemDO::getName, reqVO.getName());
+ } else {
+ query.and(w -> w.like(MesMdItemDO::getName, reqVO.getName())
+ .or().apply("REPLACE(REPLACE(REPLACE(CONCAT(COALESCE(t.name,''),COALESCE(t.specification,'')), ' ', ''), '-', ''), '鍏�', 'g') LIKE {0}",
+ "%" + keyword + "%"));
+ }
+ }
+ if (StrUtil.isNotBlank(reqVO.getSpecification())) {
+ String specification = reqVO.getSpecification().replace("鍏�", "g");
+ query.apply("REPLACE(t.specification, '鍏�', 'g') LIKE {0}", "%" + specification + "%");
+ }
return selectPage(reqVO, query);
}
--
Gitblit v1.9.3