From 6b7db6b11ebcc2e8e1eff86443e77fe63e5d8080 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 21:38:52 +0800
Subject: [PATCH] 优化程序名解析
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ProgramOnMachineExportController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ProgramOnMachineExportController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ProgramOnMachineExportController.java
index ce45ae4..d852426 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ProgramOnMachineExportController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ProgramOnMachineExportController.java
@@ -13,7 +13,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.constants.FlowVariableContants;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.ProgramOnMachineExportService;
import org.springblade.mdm.flow.service.TaskDispatchService;
@@ -49,7 +49,6 @@
return R.data(pages);
}
-
@PostMapping("/export")
@Operation(summary = "瀵煎嚭鐜板満缂栧埗璁板綍", description = "瀵煎嚭鐜板満缂栧埗璁板綍")
public void export(ProgramOnMachineQueryVO queryVO,HttpServletResponse response) throws IOException {
@@ -62,14 +61,15 @@
page.getRecords().forEach(record -> {
ProgramOnMachineExcel excel = new ProgramOnMachineExcel();
Map<String,Object> vars = record.getVariables();
- excel.setDrawingNo(Func.toStr(vars.get(FlowVariableContants.DRAWING_NO)));
- excel.setProcessNo(Func.toStr(vars.get(FlowVariableContants.PROCESS_NO)));
- excel.setProcessEdition(Func.toStr(vars.get(FlowVariableContants.PROCESS_EDITION)));
- excel.setMachineCode(Func.toStr(vars.get(FlowVariableContants.MACHINE_CODE)));
+ excel.setDrawingNo(Func.toStr(vars.get(FlowVariableConstant.DRAWING_NO)));
+ excel.setProcessNo(Func.toStr(vars.get(FlowVariableConstant.PROCESS_NO)));
+ excel.setProcessEdition(Func.toStr(vars.get(FlowVariableConstant.PROCESS_EDITION)));
+ excel.setMachineCode(Func.toStr(vars.get(FlowVariableConstant.MACHINE_CODE)));
excel.setProcessInstanceId(record.getProcessInstanceId());
+ excel.setDeviation(Func.toStr(record.getVariables().get(FlowVariableConstant.DEVIATION)));
list.add(excel);
});
- ExcelUtil.export(response, "鐜板満缂栧埗璁板綍" + DateUtil.time(), "鏈哄簥鏁版嵁琛�", list, ProgramOnMachineExcel.class);
+ ExcelUtil.export(response, "鐜板満缂栧埗璁板綍" + DateUtil.time(), "鐜板満缂栧埗璁板綍", list, ProgramOnMachineExcel.class);
}
}
--
Gitblit v1.9.3