From f379dade90ec59e08c037cba4917308e3dfdb928 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 17:02:06 +0800
Subject: [PATCH] 调整审批记录的保存方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 5ee260f..62a8d14 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,13 +24,33 @@
<!-- <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="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,draw_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="all_columns"/> from mdm_nc_program
- where is_deleted=0 and is_cured=1 and part_no=#{partNo} and is_last_edition=1
+ 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>
+
+ <sql id="all_columns">id,tenant_id,name,parent_id,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.node_type,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">
+ select <include refid="all_columns_n"/>,u.name create_user_name,(
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ mdm_nc_node
+ WHERE
+ parent_id = n.id and is_deleted = 0
+ ) AS "has_children" from mdm_nc_node n left join blade_user u on n.create_user=u.id where n.is_deleted=0 and n.parent_id=#{parentId}
+ </select>
+
+
+ <!--鑾峰彇 鏈�鏂扮増鏈殑绋嬪簭锛堝嵆绋嬪簭鍖呭悕 鑺傜偣 node_type=60锛�-->
+ <select id="getLastProgramNode" resultType="org.springblade.mdm.program.entity.NcNode">
+ select <include refid="all_columns"/> from mdm_nc_node
+ where is_deleted=0 and node_type='60' and is_last_edition=1 order by create_time desc limit 1
+ </select>
</mapper>
--
Gitblit v1.9.3