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/NcProgramExportDNCController.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java index f16180d..db7406c 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java @@ -1,13 +1,21 @@ package org.springblade.mdm.program.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tenant.annotation.NonDS; +import org.springblade.core.tool.api.R; +import org.springblade.mdm.program.service.NcProgramApprovedService; import org.springblade.mdm.program.service.NcProgramService; +import org.springblade.mdm.program.vo.NcNodeProgramQueryVO; +import org.springblade.mdm.program.vo.NcProgramExportDncPageVO; +import org.springblade.mdm.program.vo.NcProgramExportDncQueryVO; +import org.springblade.mdm.program.vo.NcProgramVO; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,11 +29,18 @@ @RestController @RequestMapping("/program/exchange") @AllArgsConstructor -@Tag(name = "瀵煎嚭DNC", description = "娑夊瘑缃戞矇鐥煎鍑篋NC") +@Tag(name = "瀵煎嚭DNC", description = "娑夊瘑缃戠▼搴忓鍑篋NC") @Slf4j public class NcProgramExportDNCController { private final NcProgramService ncProgramService; + private final NcProgramApprovedService ncProgramApprovedService; + @Operation(summary = "绋嬪簭瀵煎嚭DNC鍒嗛〉鏌ヨ", description = "鍒嗛〉鏌ヨ锛屼緵鐢ㄦ埛閫夋嫨鏁版嵁") + @GetMapping("/export-dnc-page") + public R<IPage<NcProgramExportDncPageVO>> page(NcProgramExportDncQueryVO query) { + //IPage<NcProgramVO> pages = ncProgramService.pageQuery(query); + return R.data(ncProgramApprovedService.exportDncPageQuery(query)); + } @PostMapping("/export-dnc") @Operation(summary = "鏁版帶绋嬪簭瀵煎嚭dnc", description = "鏁版帶绋嬪簭瀵煎嚭鍒板伐鎺х綉") -- Gitblit v1.9.3