From 9c483e9be881783af14ad68906e78ee557005eb4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 16 八月 2025 22:01:45 +0800
Subject: [PATCH] 修复dnc导出无header问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/FlowProgramFile.java | 4 ++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/FlowProgramFile.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/FlowProgramFile.java
index a58080d..d560e8c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/FlowProgramFile.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/entity/FlowProgramFile.java
@@ -19,7 +19,7 @@
* 绫诲瀷锛氱▼搴忔枃浠�
*/
public static final String TYPE_PROGRAM = "program";
- public static final String TYPE_OTHER = "program";
+ public static final String TYPE_OTHER = "other";
private String processInstanceId;
/**
@@ -40,6 +40,6 @@
private String fileType;
public boolean isProgram(){
- return "program".equals(fileType);
+ return TYPE_PROGRAM.equals(fileType);
}
}
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 b040170..7c565d9 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
@@ -57,12 +57,14 @@
throw new ServiceException("鏈�夋嫨鏂囦欢瀵煎嚭");
}
//try {
+ String filename = "programexp-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
+ response.setHeader("Content-Disposition", "attachment; filename="+filename);
+ response.setContentType("application/octet-stream");
+
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ncProgramExportDNCService.exportDnc(vo.getIds(),bos);
response.getOutputStream().write(bos.toByteArray());
- String filename = "programexp-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
- response.setHeader("Content-Disposition", "attachment; filename="+filename);
- response.setContentType("application/octet-stream");
+
//} catch (Exception e) {
//log.error("瀵煎嚭DNC寮傚父", e);
--
Gitblit v1.9.3