From e1c5c27a41e2410c0689b70319488c16d2e4fd51 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 21:13:08 +0800
Subject: [PATCH] 增加组长取回功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
index a810df2..0e8e925 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/DncSendBackController.java
@@ -1,6 +1,7 @@
package org.springblade.mdm.program.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -10,7 +11,8 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.program.service.DNCSendBackService;
-import org.springblade.mdm.program.vo.DncSendBackData;
+import org.springblade.mdm.program.service.DncBackFileService;
+import org.springblade.mdm.program.vo.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -30,6 +32,7 @@
public class DncSendBackController {
private final DNCSendBackService dncSendBackService;
+ private final DncBackFileService dncBackFileService;
/**
* 涓婁紶DNC鍥炰紶鏂囦欢
*
@@ -68,4 +71,47 @@
}
return R.success();
}
+
+ @Operation(summary = "宸ユ帶缃戝洖浼犺褰曞垎椤垫煡璇�", description = "宸ユ帶缃戝洖浼犺褰曞垎椤垫煡璇�,鏌ヨ鍥炰紶鍘嗗彶")
+ @GetMapping("/dnc-back-page")
+ public R<IPage<DncBackFileVO>> page(DncBackFileQueryVO query) {
+
+ return R.data(dncBackFileService.pageQuery(query));
+ }
+
+ @Operation(summary = "鍥炰紶鍙栨秷", description = "宸ユ帶缃戝洖浼犺褰曚腑鍙栨秷鏈紑濮嬫墽琛岀殑娴佺▼")
+ @PostMapping("/cancel-process")
+ public R<Void> cancelProcess(@Parameter(description = "鍥炰紶璁板綍id")long id) {
+ try{
+ dncBackFileService.cancelProcess(id);
+ return R.success();
+ }catch (Exception e){
+ log.error("娴佺▼鍙栨秷澶辫触",e);
+ return R.fail(e.getMessage());
+ }
+
+ }
+
+ @Operation(summary = "鑾峰彇鍥炰紶璁板綍鐨勬枃浠跺垪琛�", description = "鑾峰彇鍥炰紶璁板綍鐨勬枃浠跺垪琛�")
+ @GetMapping("/files-by-id")
+ public R<List<DncSendBackFile>> filesById(long id) {
+ try {
+ return R.data(dncBackFileService.filesById(id));
+ }catch (Exception e){
+ log.error("鑾峰彇鍘嗗彶鏂囦欢鍒楄〃澶辫触",e);
+ return R.fail(e.getMessage());
+ }
+ }
+
+ @GetMapping("/history-file-content")
+ @Operation(summary = "涓存椂璁板綍鍥炰紶鏂囦欢鍐呭", description = "涓存椂璁板綍鍥炰紶鏂囦欢鍐呭")
+ public R<String> historyContent(@Parameter(description = "鍘嗗彶璁板綍id")long id,@Parameter(description = "鏂囦欢鐨別ntryName") String entryName) {
+ try {
+
+ return R.data(dncBackFileService.getEntryFileContent(id,entryName));
+ }catch(Exception e) {
+ log.error("鑾峰彇鍘嗗彶鏂囦欢鍐呭澶辫触",e);
+ return R.fail(e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3