From 56558ee76f0b3d5226afe6446e70975db698492f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 18:12:29 +0800
Subject: [PATCH] 增加工控网导入 历史 查看文件功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
index 00c2a29..bb74899 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
@@ -117,20 +117,29 @@
left join blade_dict_biz dt on n.node_type=dt.dict_key and dt.code='nc_node_type' and dt.is_deleted=0
<where>
n.is_deleted=0 and n.node_type='20' and n.name=#{drawingNo}
- <if test="programStatus != null and programStatus != ''">
+ <if test="status != null and status != ''">
and
(
- <if test='programStatus.contains("1")'>
- n.parent_ids LIKE '0,1,%'
+ 1=2
+ <if test='status.contains("1".toString())'>
+ or n.parent_ids LIKE '0,1,%'
</if>
- <if test='programStatus.contains("2")'>
+ <if test='status.contains("2".toString())'>
or n.parent_ids LIKE '0,2,%'
</if>
- <if test='programStatus.contains("2")'>
+ <if test='status.contains("3".toString())'>
or n.parent_ids LIKE '0,3,%'
</if>
+
)
</if>
+
+ <if test="createTimeBegin != null">
+ and n.create_time>=#{createTimeBegin}
+ </if>
+ <if test="createTimeEnd != null">
+ and n.create_time<=#{createTimeEnd}
+ </if>
</where>
--
Gitblit v1.9.3