From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:04 +0800
Subject: [PATCH] (部级录像可用率,重点录像可用率,录像可用率)计算可用率bug修复,hk接口bug修复,

---
 ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml
index 2f1d912..8f82080 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml
@@ -98,6 +98,7 @@
         <result column="column_value" property="columnValue"/>
         <result column="ref_string_id" property="refStringId"/>
         <result column="value_id" property="valueId"/>
+        <result column="label_id" property="labelId"/>
     </resultMap>
 
     <select id="getDynamicColumnByTable" resultMap="dynamicColumnMap">
@@ -106,12 +107,17 @@
         dcv.id as value_id
         FROM
         t_dynamic_column dc
-        LEFT JOIN t_dynamic_column_value dcv ON dc.id = dcv.dynamic_column_id and dcv.ref_String_id = #{id} WHERE dc.table_name = #{tableName}
+        LEFT JOIN t_dynamic_column_value dcv ON dc.id = dcv.dynamic_column_id and dcv.ref_string_id = #{id} WHERE dc.table_name = #{tableName}
 
     </select>
 
     <select id="getDynamicColumnByTableName" resultMap="dynamicColumnMap">
-        select *,dcv.id as value_id
+        select *,
+               dc.prop_name,
+               dc.label_value,
+               dcv.column_value,
+               dcv.ref_string_id,
+               dcv.dynamic_column_id as label_id
         from  t_dynamic_column_value dcv
         left join t_dynamic_column dc
         on dc.id = dcv.dynamic_column_id

--
Gitblit v1.8.0