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 | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml
index c640b36..8f82080 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/DynamicColumnMapper.xml
@@ -60,9 +60,9 @@
</select>
<insert id="saveBatch">
- insert into t_dynamic_column_value (dynamic_column_id,column_value,ref_id) values
+ insert into t_dynamic_column_value (dynamic_column_id,column_value,ref_id,ref_string_id) values
<foreach collection="insertList" item="item" separator=",">
- (#{item.dynamicColumnId},#{item.columnValue},#{item.refId})
+ (#{item.dynamicColumnId},#{item.columnValue},#{item.refId},#{item.refStringId})
</foreach>
</insert>
<update id="updateBatch">
@@ -84,11 +84,43 @@
*
FROM
t_dynamic_column_value dcv
- LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{tableName}
+ INNER JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{tableName}
WHERE
dcv.ref_id in
<foreach collection="ids" item="id" separator="," open="(" close=")">
#{id}
</foreach>
</select>
+
+ <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
+ <result column="prop_name" property="propName"/>
+ <result column="label_value" property="labelValue"/>
+ <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">
+ SELECT
+ *,
+ 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}
+
+ </select>
+
+ <select id="getDynamicColumnByTableName" resultMap="dynamicColumnMap">
+ 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
+ where dc.table_name =#{tableName}
+ </select>
</mapper>
--
Gitblit v1.8.0