From 49ab626b5cb89219a4b4b86b5f1774f4705df51c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 15:46:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/ContractController.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ContractController.java b/src/main/java/com/zy/crm/manager/controller/ContractController.java
index 0e120e9..4a81066 100644
--- a/src/main/java/com/zy/crm/manager/controller/ContractController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ContractController.java
@@ -105,10 +105,16 @@
}
}
if (!signUserId && !signDeptId){
- wrapper.eq("user_id", getUserId());
+ if (getRole().getId()==1){
+ wrapper.or().eq("host_id",getHostId());
+ }else if (getRole().getId()==2){
+ wrapper.eq("dept_id",getDeptId());
+ }else {
+ wrapper.eq("user_id", getUserId());
+ }
}
if (signHostId){
- wrapper.or().eq("host_id",1);
+ wrapper.or().eq("host_id",getHostId());
}
}
@@ -240,7 +246,11 @@
/////////////////////////鐢熸垚Tab琛ㄦ牸鏁版嵁/////////////////////////
String fileName = this.getClass().getClassLoader().getResource("contractTemplate/" + contractTemplate + ".docx").getPath();//鑾峰彇鏂囦欢璺緞
- return WordUtils.generate(fileName, map, tabParam);
+
+// String outPdfPath = fileName.split("\\.")[0]+".pdf";
+ ResponseEntity<InputStreamResource> generate = WordUtils.generate(fileName, map, tabParam);
+// WordUtils.documents4jWordToPdf(fileName,outPdfPath);
+ return generate;
} catch (Exception e) {
return null;
}
@@ -261,7 +271,7 @@
//鏂囦欢鍚庣紑鍚�
String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
//涓婁紶鏂囦欢鍚�
- String filename = format.format(new Date()) + suffix;
+ String filename = format.format(new Date()) + "_" + file.getOriginalFilename();
//鏈�缁堟枃浠惰矾寰�
String filepath = path + "/" + filename;
//OSS鏂囦欢瀛樺偍璺緞
@@ -289,20 +299,17 @@
@RequestMapping(value = "/contract/download/auth")
@ManagerAuth(memo = "涓嬭浇鍚堝悓")
- public ResponseEntity<InputStreamResource> download(@RequestParam("id") Integer id) {
+ public R download(@RequestParam("id") Integer id) {
Contract contract = contractService.selectById(id);
if (contract == null) {
- return null;
+ return R.error();
}
if (Cools.isEmpty(contract.getFilepath())) {
- return null;
+ return R.error();
}
- try {
- return ossService.downloadFile(contract.getFilepath());//浠嶰SS涓笅杞芥枃浠�
- } catch (Exception e) {
- return null;
- }
+ String download = ossService.download(contract.getFilepath());//鑾峰彇OSS涓存椂涓嬭浇URL
+ return R.ok().add(download);
}
@RequestMapping(value = "/contract/export/auth")
--
Gitblit v1.9.1