From b7e00803f7c6c908a7f14ef9fd54da690f659f54 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 11 四月 2025 17:09:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 8e4acc0..2a73ac5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -46,6 +46,7 @@
import com.ruoyi.system.vo.CheckAcceptRecordVO;
import com.ruoyi.system.vo.TContractVO;
import com.ruoyi.web.controller.tool.NumberToChineseUtils;
+import com.ruoyi.web.controller.tool.TencentCosUtil;
import com.ruoyi.web.controller.tool.WordUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -62,6 +63,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -358,6 +360,8 @@
}
@Autowired
private WordUtil wordUtil;
+ @Autowired
+ private TencentCosUtil tencentCosUtil;
@ApiOperation(value = "生成合同附件")
@PostMapping("/set")
@Log(title = "生成合同附件", businessType = BusinessType.EXPORT)
@@ -532,12 +536,18 @@
fill(templateParam, "checkTime", "");
}
+ String url = "";
+ if (StringUtils.isNotEmpty(contract.getSignature())){
+ url = tencentCosUtil.downLoadFileImg(contract.getSignature());
+ }
+
+
return wordUtil.generatePdf(
"/usr/local/project/file/",
templateFileName,
templateParam,
"租赁合同",
- "/usr/local/project/file/");
+ "/usr/local/project/file/",url);
}
private BigDecimal extracted(TContract contract,TContractDTO dto) {
--
Gitblit v1.7.1