From 813f0f6d391b7f24682204c22c059ef69b124fa6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 30 六月 2025 23:59:15 +0800
Subject: [PATCH] 增加流程与程序关联查询
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java | 9 ++++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java | 9 ++++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml | 4 ++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java | 2 ++
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
index 04b25f5..26a2d3a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
@@ -11,6 +11,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcProgramService;
+import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
@@ -33,7 +34,7 @@
public class NcProgramController {
private final NcProgramService ncProgramService;
-
+ private final ProcessProgRefService ncProcessProgRefService;
@PostMapping("/upload")
@Operation(summary = "涓婁紶鏂囦欢", description = "涓婁紶绋嬪簭/闄勪欢鏂囦欢")
public R<Boolean> upload(NcProgramUploadVO uploadVO) {
@@ -85,4 +86,10 @@
IPage<NcProgramVO> pages = ncProgramService.pageQuery(query);
return R.data(pages);
}
+
+ @GetMapping("/list-by-process")
+ @Operation(summary = "鑺傜偣绋嬪簭鏂囦欢鍒楄〃", description = "鏌愯妭鐐瑰唴鐨勭▼搴忓垪琛紝浠呪�樼▼搴忓寘鈥欏瓧鍏稿��60")
+ public R<List<NcProgramVO>> listByProcess(@Parameter(description="鎵�灞炶妭鐐笽D")@RequestParam String processInstanceId) {
+ return R.data(ncProcessProgRefService.listByProcess(processInstanceId));
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java
index e02855e..5b854c7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.java
@@ -4,9 +4,11 @@
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.vo.NcNodeVO;
+import org.springblade.mdm.program.vo.NcProgramVO;
import java.util.List;
public interface ProcessProgRefMapper extends BladeMapper<ProcessProgRef> {
+ List<NcProgramVO> listByProcess(String processInstanceId);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml
index 5f796a3..067d372 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProcessProgRefMapper.xml
@@ -3,4 +3,8 @@
<mapper namespace="org.springblade.mdm.program.mapper.ProcessProgRefMapper">
+ <select id="listByProcess" resultType="org.springblade.mdm.program.vo.NcProgramVO">
+ select p.id,p.name,url,code from mdm_process_prog_ref r join mdm_nc_program p on r.nc_program_id=p.id
+ where process_instance_id=#{processInstanceId} and p.is_deleted=0
+ </select>
</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
index 1b5ac3b..69cf391 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
@@ -93,5 +93,12 @@
this.saveBatch(entities);
}
-
+ /**
+ * 鏌ヨ娴佺▼鍏宠仈鐨勭▼搴廼浜屾爣
+ * @param processInstanceId
+ * @return
+ */
+ public List<NcProgramVO> listByProcess(String processInstanceId) {
+ return this.getBaseMapper().listByProcess(processInstanceId);
+ }
}
--
Gitblit v1.9.3