From 6e879958b1733a424363c83d025973ef40b89a8a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 02 八月 2025 17:51:17 +0800
Subject: [PATCH] 修改审批完成时记录审批表数据逻辑
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 90f6c17..feb0f0d 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
@@ -11,8 +11,10 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.commons.vo.IdsVO;
import org.springblade.mdm.program.service.NcProgramApprovedService;
+import org.springblade.mdm.program.service.NcProgramExportDNCService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcProgramExportDncPageVO;
@@ -37,10 +39,10 @@
private final NcProgramService ncProgramService;
private final NcProgramApprovedService ncProgramApprovedService;
+ private final NcProgramExportDNCService ncProgramExportDNCService;
@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));
}
@@ -51,7 +53,10 @@
throw new ServiceException("鏈�夋嫨鏂囦欢瀵煎嚭");
}
try {
- ncProgramApprovedService.exportDnc(vo.getIds(),response.getOutputStream());
+ String filename = "todncexp-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
+ response.setHeader("Content-Disposition", "attachment; filename="+filename);
+ response.setContentType("application/octet-stream");
+ ncProgramExportDNCService.exportDnc(vo.getIds(),response.getOutputStream());
} catch (IOException e) {
log.error("瀵煎嚭DNC寮傚父", e);
throw new RuntimeException(e);
@@ -59,4 +64,6 @@
}
+
+
}
--
Gitblit v1.9.3