From 3eba8b62a62ecb56f8d286d5a93ba2768d54e3f3 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 15 五月 2025 17:55:22 +0800
Subject: [PATCH] 工具管理-工具分类特征参数:刀片参数、通用工具参数导入
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
index bb5aef0..a7d298a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
@@ -7,6 +7,7 @@
, p.product_id
, p.component_id
, p.parts_id
+ , p.psv_id
, p.PROCESS_NAME
, p.PROCESS_CODE
, p.CRAFT_NO
@@ -24,8 +25,42 @@
, (select sys_user.realname from sys_user where p.update_by=sys_user.username) as updateName
from nc_process_stream p
inner join
- (select distinct PROCESS_ID from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
- on p.PROCESS_ID = s.PROCESS_ID
+ (select business_id,business_type from nc_permission_stream_new where delete_flag = 0 and user_id=#{userId}) s
+ on p.PROCESS_ID = s.business_id and s.business_type='5'
where p.delete_flag = 0
</select>
+ <select id="findByPartsAndComponents" resultType="org.jeecg.modules.dnc.entity.ProcessStream">
+ SELECT
+ *
+ FROM
+ nc_process_stream ps
+ WHERE
+ ps.PROCESS_ID IN (
+ SELECT
+ pss.PROCESS_ID
+ FROM
+ nc_process_stream pss
+ WHERE
+ 1=1
+ <if test="productId != null and productId != ''">
+ AND pss.PRODUCT_ID = #{productId}
+ </if>
+ <if test="componentIds != null and componentIds.size() > 0">
+ AND pss.COMPONENT_ID IN
+ <foreach collection = "componentIds" item = "componentId" index = "index" open = "(" close= ")" separator = ",">
+ #{ componentId }
+ </foreach>
+ </if>
+ AND (
+ pss.PARTS_ID IS NULL
+ <if test="partsIds != null and partsIds.size() > 0">
+ OR pss.PARTS_ID IN
+ <foreach collection = "partsIds" item = "partsId" index = "index" open = "(" close = ")" separator = ",">
+ #{ partsId }
+ </foreach>
+ </if>
+ )
+ );
+
+ </select>
</mapper>
--
Gitblit v1.9.3