From b4d10ff7535002dddb63a0b28ddb37fee7ed1e9d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 十二月 2025 16:30:53 +0800
Subject: [PATCH] 增加pdf，xlsx，docx文件预览功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ProgramOnMachineExportController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 ea72a31..d99de29 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
@@ -7,6 +7,7 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.HistoryService;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
@@ -37,13 +38,12 @@
@Tag(name = "鐜板満缂栧埗瀵煎嚭", description = "鐜板満缂栧埗瀵煎嚭")
public class ProgramOnMachineExportController {
- private FlowCommonService flowCommonService;
private ProgramOnMachineExportService programOnMachineService;
private final TaskDispatchService taskDispatchService;
- private final HistoryService historyService;
+
@GetMapping("/finished-page")
@ApiOperationSupport(order = 3)
- @Operation(summary = "宸插鎵瑰垪琛�", description = "宸插鎵瑰垪琛�")
+ @Operation(summary = "鐜板満缂栧埗寰呭鍑哄垪琛�", description = "鐜板満缂栧埗寰呭鍑哄垪琛�")
public R<IPage<FlowVO>> finishedPage(ProgramOnMachineQueryVO queryVO) {
IPage<FlowVO> pages = programOnMachineService.finishedPage(Condition.getPage(queryVO), queryVO);
return R.data(pages);
@@ -66,9 +66,13 @@
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)));
+ if(StringUtils.isNotBlank(excel.getDeviation())) {
+ excel.setDeviationSerial(taskDispatchService.getDeviationSerial(Func.toStr(vars.get(FlowVariableConstant.PROGRAM_NO))) + "");//鏇存敼鍗曞簭鍙�
+ }
list.add(excel);
});
- ExcelUtil.export(response, "鐜板満缂栧埗璁板綍" + DateUtil.time(), "鏈哄簥鏁版嵁琛�", list, ProgramOnMachineExcel.class);
+ ExcelUtil.export(response, "鐜板満缂栧埗璁板綍" + DateUtil.time(), "鐜板満缂栧埗璁板綍", list, ProgramOnMachineExcel.class);
}
}
--
Gitblit v1.9.3