From 9e23d16d0d591256d7c508bffa8facc72f2b9b7a Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Thu, 14 Mar 2024 15:53:48 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E7=9F=A9=E9=98=B5?= =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E5=9E=8B=E7=9A=84=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E7=B1=BB=E5=9E=8B=E5=B1=9E=E6=80=A7=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E6=97=A0=E6=B3=95=E8=BF=87=E6=BB=A4=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1112233155723264]矩阵中配置型的下拉框类型属性模糊匹配无法过滤选项 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1112233155723264 --- .../dao/mapper/cientity/CiEntityMapper.java | 10 ++ .../dao/mapper/cientity/CiEntityMapper.xml | 26 ++++ .../dao/mapper/cientity/RelEntityMapper.java | 9 +- .../dao/mapper/cientity/RelEntityMapper.xml | 88 ++++++++++++ .../matrix/handler/CiDataSourceHandler.java | 126 +++++++++++------- 5 files changed, 207 insertions(+), 52 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java index d1006f3c..44379cc0 100644 --- a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java +++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.java @@ -119,6 +119,14 @@ public interface CiEntityMapper extends ICiEntityCrossoverMapper { */ List getVirtualCiEntityBaseInfoByName(CiEntityVo ciEntityVo); + /** + * 根据配置项名称模糊匹配获取虚拟模型配置项 + * + * @param ciEntityVo 条件 + * @return 配置项列表 + */ + List getVirtualCiEntityBaseInfoByLikeName(CiEntityVo ciEntityVo); + /** * 根据id列表返回多个配置项基本信息 * @@ -206,6 +214,8 @@ public interface CiEntityMapper extends ICiEntityCrossoverMapper { List getCiEntityListByCiIdListAndName(CiEntityVo ciEntityVo); + List getCiEntityListByCiIdListAndLikeName(CiEntityVo ciEntityVo); + List searchExpiredCiEntityId(CiEntityVo ciEntityVo); Long getCiEntityIdByCiNameAndCiEntityName(@Param("ciName") String ciName, @Param("ciEntityName") String ciEntityName); diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml index 0d7f9909..7923ce35 100644 --- a/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml +++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/cientity/CiEntityMapper.xml @@ -333,6 +333,13 @@ WHERE name = #{name} + + + + + + + + + + + +