From 0bdfd76339bb58be09927b8c2fe268175c3a7cc8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 10:11:33 +0800
Subject: [PATCH] 优化现场编制导出
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/ProgramOnMachineExportController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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..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,13 +7,14 @@
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;
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;
@@ -37,18 +38,16 @@
@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);
}
-
@PostMapping("/export")
@Operation(summary = "瀵煎嚭鐜板満缂栧埗璁板綍", description = "瀵煎嚭鐜板満缂栧埗璁板綍")
@@ -62,14 +61,18 @@
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)));
+ 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