From fc3ae614a4c5a2a7cdb9029ecfc4372eb1c28b18 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 09 九月 2025 11:41:42 +0800
Subject: [PATCH] 补充确认表，审批表模板字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java
index 8ab66f9..a2f9a8d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/controller/ConfirmTablePrintController.java
@@ -6,12 +6,10 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
+import liquibase.logging.mdc.customobjects.History;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.DateUtil;
import org.flowable.engine.HistoryService;
-import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -21,11 +19,8 @@
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.flow.service.TaskDispatchService;
-import org.springblade.mdm.flow.vo.DispathTaskQueryVO;
import org.springblade.mdm.flow.vo.FlowVO;
-import org.springblade.mdm.statreport.service.ApproveTableService;
import org.springblade.mdm.statreport.service.ConfirmTablePrintService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,8 +40,7 @@
private FlowCommonService flowCommonService;
private ConfirmTablePrintService confirmTablePrintService;
private final TaskDispatchService taskDispatchService;
- private final HistoryService hisService;
-
+ private final HistoryService historyService;
@GetMapping("/confirm-page")
@ApiOperationSupport(order = 3)
@Operation(summary = "纭鍗曞垪琛�", description = "纭鍗曞垪琛�")
@@ -60,16 +54,15 @@
@Operation(summary = "瀵煎嚭鏁版帶绋嬪簭纭琛�", description = "鏁版帶绋嬪簭纭琛�")
public void exportConfirmTable(String processInstanceId,HttpServletResponse response) throws IOException {
- HistoricProcessInstance his = hisService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
- String taskDispatchId = his.getBusinessKey();
- TaskDispatch dispatch = taskDispatchService.getById(taskDispatchId);
FlowProgramProperties props = flowCommonService.getProgramPropertiesFromHis(processInstanceId);
+ HistoricProcessInstance his = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ //TaskDispatch dispatch = taskDispatchService.getById(his.getBusinessKey());
String progName = props.getDrawingNo()+"-"+props.getProcessNo()+"-"+props.getProcessEdition();
String filename = UrlUtil.encode("鏁版帶绋嬪簭纭琛�"+progName)+".docx";
- ByteArrayOutputStream outputStream = confirmTablePrintService.exportConfirmTableDoc(dispatch,props);
+ ByteArrayOutputStream outputStream = confirmTablePrintService.exportConfirmTableDoc(props);
byte[] fileBytes = outputStream.toByteArray();
--
Gitblit v1.9.3