From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java
index 979302f..0bae8fc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/FileSendRecordController.java
@@ -14,6 +14,8 @@
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
+import org.springblade.mdm.commons.service.OssFileCommonService;
+import org.springblade.mdm.machinefile.entity.FileSendRecord;
import org.springblade.mdm.machinefile.entity.MachineFile;
import org.springblade.mdm.machinefile.service.FileSendRecordService;
import org.springblade.mdm.machinefile.service.MachineFileChangeHisService;
@@ -43,7 +45,7 @@
@Slf4j
public class FileSendRecordController {
@Autowired
- private MdmDeptService mdmDeptService;
+ private OssFileCommonService ossFileCommonService;
@Autowired
private FileSendRecordService fileSendRecordService;
@@ -56,6 +58,13 @@
return R.data(fileSendRecordService.pageQuery(query));
}
+ @GetMapping("/download-by-id")
+ @Operation(summary = "涓嬪彂鏂囦欢璁板綍鍒楄〃", description = "涓嬪彂鏂囦欢璁板綍鍒楄〃")
+ public void downloadByRecordId(Long id,HttpServletResponse response) throws IOException {
+ FileSendRecord record = fileSendRecordService.getById(id);
+ ossFileCommonService.download(record.getOssName(),record.getName(),response);
+ }
+
@GetMapping("/export-excel")
@Operation(summary = "涓嬪彂鏂囦欢璁板綍琛ㄥ鍑�", description = "涓嬪彂鏂囦欢璁板綍琛ㄥ鍑�")
@@ -63,7 +72,6 @@
query.setCurrent(1);
query.setSize(Integer.MAX_VALUE);
- //IPage<MachineBackFileVO> pages = service.pageQuery(query);
IPage<FileSendRecordVO> pages = fileSendRecordService.pageQuery(query);
List<FileSendRecordExcelVO> list = new ArrayList<>();
pages.getRecords().forEach(m ->{
--
Gitblit v1.9.3