From a4ee8b2e144ae1118ff714554911b7d34705416e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 07 五月 2025 17:45:52 +0800
Subject: [PATCH] 导出添加自定义签名功能
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
index b8f2d71..ced7d39 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
@@ -751,11 +751,9 @@
if (qualityMonitorDetailsId == null) {
throw new ErrorException("缂哄皯鐩戞帶璇︽儏id");
}
- QualityMonitorDetails qualityMonitorDetails = qualityMonitorDetailsService.getOne(Wrappers.<QualityMonitorDetails>lambdaUpdate()
- .eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetailsId));
LocalDateTime now = LocalDateTime.now();
Integer userId =SecurityUtils.getUserId().intValue();
-
+ String contentType = file.getContentType();
String urlString;
String pathName;
try {
@@ -768,10 +766,13 @@
urlString = realpath + "/" + pathName;
file.transferTo(new File(urlString));
- wordInsertUrl(new HashMap<String, Object>() {{
- put("writeUrl", UserUtils.getFinalUserSignatureUrl(userId));
- put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
- }}, wordUrl + "/" + pathName.replace("/word", wordUrl));
+ // 鍒ゆ柇鏄惁鏄痯df
+ if (!contentType.contains("pdf")) {
+ wordInsertUrl(new HashMap<String, Object>() {{
+ put("writeUrl", UserUtils.getFinalUserSignatureUrl(userId));
+ put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
+ }}, wordUrl + "/" + pathName.replace("/word", wordUrl));
+ }
qualityMonitorDetailsService.update(Wrappers.<QualityMonitorDetails>lambdaUpdate()
.eq(QualityMonitorDetails::getQualityMonitorDetailsId, qualityMonitorDetailsId)
@@ -807,7 +808,7 @@
// 娣诲姞鎵瑰噯浜�
QualityMonitorDetails details = qualityMonitorDetailsMapper.selectById(qualityMonitorDetails.getQualityMonitorDetailsId());
- if (StringUtils.isNotBlank(details.getFinishReportUrl())) {
+ if (StringUtils.isNotBlank(details.getFinishReportUrl()) && !details.getFinishReportUrl().contains(".pdf")) {
wordInsertUrl(new HashMap<String, Object>() {{
put("ratifyUrl", UserUtils.getFinalUserSignatureUrl(userId));
put("ratifyDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(now)).create());
--
Gitblit v1.9.3