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 | 6 +++--- 1 files changed, 3 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 19b09ce..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,11 +24,11 @@ <!-- <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,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="prog_all_columns"/> from mdm_nc_program - where is_deleted=0 and is_cured=1 and part_no=#{partNo} and is_last_edition=1 + 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 @@ -43,7 +43,7 @@ FROM mdm_nc_node WHERE - parent_id = id and is_deleted = 0 + 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> -- Gitblit v1.9.3