From 9d30f3aba92b1fe90eaecd486113f544f0f18b7c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 16:41:11 +0800
Subject: [PATCH] 资产管理动态字段
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 604549a..1b1f3f3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -490,13 +490,14 @@
tm.lxbm,
dc.prop_name,
dc.label_value,
- dc.field_value
+ dcv.column_value
FROM
t_monitor tm
- LEFT JOIN t_dynamic_column dc ON tm.id = dc.ref_id
+ LEFT JOIN t_dynamic_column_value dcv ON tm.id = dcv.ref_id
+ LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{query.tableName}
<where>
<if test="query.keyword != null and query.keyword != ''">
- AND (tm.name like concat('%', #{query.keyword}, '%') OR dc.field_value like concat('%', #{query.keyword}, '%'))
+ AND (tm.name like concat('%', #{query.keyword}, '%') OR dcv.column_value like concat('%', #{query.keyword}, '%'))
</if>
</where>
</select>
@@ -538,7 +539,7 @@
<resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
<result column="prop_name" property="propName"/>
<result column="label_value" property="labelValue"/>
- <result column="field_value" property="fieldValue"/>
+ <result column="column_value" property="columnValue"/>
</resultMap>
</mapper>
--
Gitblit v1.8.0