From d2487891866a2aa42c7cb3ff9a8e7e869877d782 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 13:49:20 +0800
Subject: [PATCH] 替换流程完成后增加了审批记录，可导出；程序版本号+1;增加批量审核接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 70 ++++++++++++++++++++++++++++++----
1 files changed, 61 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 7513fc0..9789a02 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
@@ -26,6 +26,11 @@
<!-- </select>-->
<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>
+
+ <delete id="deleteSubNodes">
+ 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
@@ -33,10 +38,31 @@
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.description,n.remark,n.status,n.create_dept,n.is_deleted,n.create_time,n.create_user,n.update_time,n.update_user</sql>
+ -->
+ <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">
+ select <include refid="all_columns_n"/>,dt.dict_value as node_type_name,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_last_edition=1 and is_deleted = 0
+ ) 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}
+ </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>
+
+ <!--棣栭〉鏌ヨ-->
+ <select id="searchList" 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
CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
@@ -46,13 +72,39 @@
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
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.parent_id=#{parentId}
+ where n.is_deleted=0 and n.node_type=#{nodeType} and n.name like CONCAT('%', #{name}, '%')
+
+ </select>
+ <select id="searchListInIds" 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
+ 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
+ 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>
+ <if test="ids != null and ids.size() > 0">
+ n.id IN
+ <foreach collection="ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="ids == null or ids.size() == 0">
+ 1=0
+ </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
+
+ 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>
- <!--鑾峰彇 鏈�鏂扮増鏈殑绋嬪簭锛堝嵆绋嬪簭鍖呭悕 鑺傜偣 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