From b7af95d487f49490de16f9636147e5a40911e157 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 23:36:48 +0800
Subject: [PATCH] 确认表增加程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
index 69c095d..c729b8e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java
@@ -15,12 +15,12 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
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.service.ApproveTableService;
-import org.springblade.mdm.flow.service.FlowBusinessService;
-import org.springblade.mdm.flow.service.WIthdrawService;
+import org.springblade.core.tool.utils.UrlUtil;
+import org.springblade.mdm.flow.service.*;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.flow.vo.OvertimeTaskExcelVO;
import org.springblade.mdm.flow.vo.TaskTraceVO;
@@ -48,11 +48,14 @@
private TaskService taskService;
@Autowired
private FlowBusinessService businessService;
-
+ @Autowired
+ private FlowCommonService flowCommonService;
@Autowired
private HistoryService historyService;
@Autowired
private ApproveTableService approveTableService;
+ @Autowired
+ private ProgramConfirmTableService programConfirmTableService;
@Autowired
private IUserClient userClient;
@Autowired
@@ -167,13 +170,14 @@
}
@PostMapping("/export-approve-table")
- @Operation(summary = "瀵煎嚭瀹℃壒琛�", description = "瀵煎嚭瀹℃壒琛╡xcel")
+ @Operation(summary = "瀵煎嚭瀹℃壒琛�", description = "瀵煎嚭瀹℃壒琛╬df")
public void exportApproveTable(String processInstanceId, HttpServletResponse response) {
try {
-
- String filename = URLEncoder.encode("鏁版帶绋嬪簭缂栧埗瀹℃壒鍗�", StandardCharsets.UTF_8)+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".pdf";
-
+ FlowProgramProperties props = flowCommonService.getProgramPropertiesFromHis(processInstanceId);
+ String progName = props.getDrawingNo()+"-"+props.getProcessNo()+"-"+props.getProcessEdition();
+ //String filename = URLEncoder.encode("鏁版帶绋嬪簭缂栧埗瀹℃壒鍗�", StandardCharsets.UTF_8)+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".pdf";
+ String filename = UrlUtil.encode("鏁版帶绋嬪簭缂栧埗瀹℃壒鍗�"+progName)+".pdf";
response.setHeader("Content-Disposition", "attachment; filename="+filename);
response.setContentType("application/octet-stream");
approveTableService.exportApproveTable(processInstanceId,response.getOutputStream());
@@ -184,6 +188,24 @@
}
+ @PostMapping("/export-confirm-table")
+ @Operation(summary = "瀵煎嚭纭琛�", description = "瀵煎嚭鏁版帶绋嬪簭纭琛╬df")
+ public void exportConfirmTable(String processInstanceId, HttpServletResponse response) {
+
+ try {
+ FlowProgramProperties props = flowCommonService.getProgramPropertiesFromHis(processInstanceId);
+ String progName = props.getDrawingNo()+"-"+props.getProcessNo()+"-"+props.getProcessEdition();
+ String filename = UrlUtil.encode("鏁版帶绋嬪簭纭琛�"+progName)+".pdf";
+ response.setHeader("Content-Disposition", "attachment; filename="+filename);
+ response.setContentType("application/octet-stream");
+ programConfirmTableService.exportConfirmTable(props,response.getOutputStream());
+ } catch (Exception e) {
+ log.error("瀵煎嚭鏁版帶绋嬪簭纭琛╬df寮傚父", e);
+ throw new RuntimeException(e);
+ }
+
+ }
+
@GetMapping("/withdraw")
@Operation(summary = "鎾ゅ洖浠诲姟", description = "浠庡叾浠栦换鍔¤妭鐐圭洿鎺ユ挙鍥炵紪绋嬪憳鑺傜偣")
public R<Void> withdraw(String processInstanceId) {
--
Gitblit v1.9.3