From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 eefd170..1cf5c54 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
@@ -31,14 +31,11 @@
delete from mdm_nc_node where parent_id=#{nodeId}
</delete>
<!--
- <select id="getCuredNcProgram" resultMap="BaseResultMap">
- select <include refid="prog_all_columns"/> from mdm_nc_program
- where is_deleted=0 and is_cured=1 and drawing_no=#{drawingNo} and is_last_edition=1
- and machine_code in (select code from mdm_machine where machine_group_code=#{machineGroupCode})
- order by create_time desc
- limit 1
- </select>
+ <delete id="deleteMachineGroupNodeByParentId">
+ delete from mdm_nc_node where parent_id=#{parentId} and node_type='50'
+ </delete>
-->
+
<sql id="all_columns">id,tenant_id,name,parent_id,parent_ids,node_type,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
<sql id="all_columns_n">n.id,n.tenant_id,n.name,n.parent_id,n.parent_ids,n.node_type,n.version_number,n.description,n.remark,n.drawing_no,n.drawing_no_edition,n.craft_edition,n.is_last_edition,n.is_locked,n.process_edition,n.process_no,n.product_model,n.is_cured,n.process_instance_id,n.status,n.create_dept,n.is_deleted,n.create_time,n.create_user,n.update_time,n.update_user</sql>
<select id="lazyList" resultType="org.springblade.mdm.program.vo.NcNodeVO">
@@ -52,6 +49,7 @@
) AS "has_children" from mdm_nc_node n left join blade_user u on n.create_user=u.id
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.is_last_edition=1 and n.parent_id=#{parentId}
+ order by id
</select>
@@ -97,7 +95,7 @@
</if>
</where>
</select>
-
+ <!--
<select id="historyByParentIdAndName" resultType="org.springblade.mdm.program.vo.NcNodeVO">
select n.id,n.name,n.version_number,n.create_time,n.update_time,u.name create_user_name,n.process_no
from mdm_nc_node n left join blade_user u on n.create_user=u.id and u.is_deleted=0
@@ -105,6 +103,7 @@
where n.is_deleted=0 and n.parent_id in (select id from mdm_nc_node where parent_id=#{parentNode.parentId}) and n.name=#{name}
</select>
+ -->
<select id="searchList2" resultType="org.springblade.mdm.program.vo.NcNodeVO">
select <include refid="all_columns_n"/>,dt.dict_value as node_type_name,u.name create_user_name,(
SELECT
@@ -120,27 +119,32 @@
<if test="status != null and status != ''">
and
(
- <if test='status.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='status.contains("2")'>
+ <if test='status.contains("2".toString())'>
or n.parent_ids LIKE '0,2,%'
</if>
- <if test='status.contains("2")'>
+ <if test='status.contains("3".toString())'>
or n.parent_ids LIKE '0,3,%'
</if>
+
)
</if>
+
<if test="createTimeBegin != null">
- n.create_time>=#{createTimeBegin}
+ and n.create_time>=#{createTimeBegin}
</if>
<if test="createTimeEnd != null">
- n.create_time<=#{createTimeEnd}
+ and n.create_time<=#{createTimeEnd}
</if>
</where>
</select>
-
+ <delete id="deleteOldEditionNodeData">
+ delete from mdm_nc_node where is_last_edition <> 1;
+ </delete>
</mapper>
--
Gitblit v1.9.3