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/service/ProgramConfirmTableService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
index 23113ee..a33e49c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
@@ -120,7 +120,7 @@
//闆剁粍浠跺悕绉�
data.put("drawingName",getDrawingName(props.getDrawingNo()));
- data.put("deviation",props.getDeviation());
+ data.put("deviation",props.getDeviation()!=null?props.getDeviation():StringUtils.EMPTY);
@@ -136,12 +136,14 @@
data.put("fuheY","Y");//TODO 鏈� 妫�楠屽憳 鍒欑鍚�
data.put("keyongY","Y");//TODO 鏈� 妫�楠屽憳 鍒欑鍚�
+ data.put("jly","鏉ユ簮MES/2025-1-1");
+ data.put("jln","鏉ユ簮MES/2025-1-1");
ApproveTableInfo approveInfo = approveInfoQueryService.getApproveInfo(props);
data.put("programmerName",approveInfo.getProgrammerName());
data.put("checkerName",approveInfo.getCheckerName());
data.put("seniorName",approveInfo.getSeniorName());
- data.put("programNo",approveInfo.getProgramNo());
+ data.put("programNo",approveInfo.getProgramName());
return data;
}
--
Gitblit v1.9.3