From 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 15:29:38 +0800
Subject: [PATCH] 现场编制功能适配

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
index d8bd2fa..dd34604 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.java
@@ -1,14 +1,9 @@
 package org.springblade.mdm.program.mapper;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.mapper.BladeMapper;
 import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcNodeProgramVO;
-import org.springblade.mdm.program.vo.NcNodeQueryVO;
-import org.springblade.mdm.program.vo.NcNodeVO;
+import org.springblade.mdm.program.vo.*;
 
 import java.util.List;
 
@@ -24,7 +19,19 @@
 	 */
 	NcNode getLastProgramNode(String name);
 
-    List<NcNodeVO> searchList(NcNodeQueryVO queryVO);
+	/**
+	 * 棣栭〉鎼滅储 鑰佺殑
+	 * @param queryVO
+	 * @return
+	 */
+    List<NcNodeVO> searchList(NcNodeOldQueryVO queryVO);
+
+	/**
+	 * 棣栭〉鎼滅储
+	 * @param queryVO
+	 * @return
+	 */
+	List<NcNodeVO> searchList2(NcNodeQueryVO queryVO);
 
 	List<NcNodeVO> searchListInIds(List<Long> ids);
 
@@ -34,5 +41,22 @@
 	 * @param name 鑺傜偣鍚嶇О
 	 * @return
 	 */
-    List<NcNodeVO> historyByParentIdAndName(@Param("parentId")Long parentId,@Param("name") String name);
+    //List<NcNodeVO> historyByParentIdAndName(@Param("name") String name,@Param("parentNode")NcNode parentNode);
+
+	/**
+	 * 鍒犻櫎瀛愯妭鐐癸紝鐢ㄤ簬鍒犻櫎绋嬪簭鍖呭悕鑺傜偣鐨勫瓙鑺傜偣
+	 * @param nodeId
+	 */
+    void deleteSubNodes(Long nodeId);
+
+	/**
+	 * 绉婚櫎鏌愯妭鐐逛笅鐨勫姞宸ユ満搴婅妭鐐�
+	 * @param parentId 绯绘浣唅d
+	 */
+   // void deleteMachineGroupNodeByParentId(Long parentId);
+
+	/**
+	 * 鍒犻櫎闈炴渶鏂扮増鏈憿鐨勬暟鎹甽ast_edition<>1
+	 */
+    void deleteOldEditionNodeData();
 }

--
Gitblit v1.9.3