From 813f0f6d391b7f24682204c22c059ef69b124fa6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 23:59:15 +0800
Subject: [PATCH] 增加流程与程序关联查询
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 11 ++---------
1 files changed, 2 insertions(+), 9 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 bc00658..67157f3 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
@@ -24,7 +24,7 @@
<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!-- </select>-->
- <sql id="prog_all_columns">id,tenant_id,nc_node_id,code,name,package_name,machine_code,part_no,is_cured,
+ <sql id="prog_all_columns">id,tenant_id,nc_node_id,code,name,machine_code,part_no,is_cured,
expire_date,process_edition,is_last_edition,is_locked,task_assign_time,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
<select id="getCuredNcProgram" resultMap="BaseResultMap">
select <include refid="prog_all_columns"/> from mdm_nc_program
@@ -45,14 +45,7 @@
parent_id = n.id and is_deleted = 0
) AS "has_children" from mdm_nc_node n where is_deleted=0 and parent_id=#{parentId}
</select>
- <select id="programPageQuery" resultType="org.springblade.mdm.program.vo.NcNodeProgramVO">
- select id,parent_id,machine_code,drawing_no,drawing_no_edition,part_no,process_name,craft_edition from mdm_nc_node n
- <where>
- <if test="query.name!=null and query.name!=''">
- and n.name like CONCAT('%', #{query.name,jdbcType=VARCHAR},'%')
- </if>
- </where>
- </select>
+
<!--鑾峰彇 鏈�鏂扮増鏈殑绋嬪簭锛堝嵆绋嬪簭鍖呭悕 鑺傜偣 node_type=60锛�-->
<select id="getLastProgramNode" resultType="org.springblade.mdm.program.entity.NcNode">
--
Gitblit v1.9.3