xiaoqi/crm-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
时间淡忘一切 2023-12-21 17:47:06 +08:00
commit 692b678d8e
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/pom.xml
View File

@ -191,7 +191,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.18</version>
<version>1.4.20</version>
</dependency>
<dependency>
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>

10
server/src/main/java/cn/keking/service/ContractService.java
View File

@ -237,7 +237,7 @@ public class ContractService {
* @throws Exception
*/
public File download(String templateName, Map<String, Object> dataMap) throws Exception {
public File download(String templateName, Map<String, Object> dataMap,String type) throws Exception {
OutputStream os = null;
try {
File outFile = new File(Consts.uploadAbsDir());
@ -266,10 +266,12 @@ public class ContractService {
xwpfDocument.write(os);
String outFilePath = Consts.uploadAbsDir()+ File.separator+ pdfName;
officeToPdfService.openOfficeToPDF(pathFile, outFilePath);
//返回pdf
return new File(outFilePath);
if("pdf".equals(type)){
//返回pdf
return new File(outFilePath);
}
//返回word
//return new File(pathFile);
return new File(pathFile);
} finally {
if (os != null) {
os.close();

11
server/src/main/java/cn/keking/web/controller/ContractController.java
View File

@ -5,6 +5,7 @@ import cn.keking.service.ContractService;
import cn.keking.utils.Consts;
import cn.keking.utils.ServiceResponse;
import com.alibaba.fastjson2.JSON;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@ -119,17 +120,21 @@ public class ContractController {
@ApiParam(value = "模板名称: 销售合同: sellContract ; 销售框架合同: frameContract", required = true) @PathVariable String templateName,
@io.swagger.v3.oas.annotations.parameters.RequestBody()
@RequestBody Map<String, Object> dataMap,
HttpServletResponse response
HttpServletResponse response,
@RequestParam(value = "type", required = false) String type
) {
try {
log.error(JSON.toJSONString(dataMap));
OutputStream outstream = null;
if (type == null) {
type="pdf";
}
File file = contractService.download(templateName, dataMap);
File file = contractService.download(templateName, dataMap,type);
outstream = response.getOutputStream();
response.setCharacterEncoding("utf-8");
response.setContentType("application/octet-stream");
String filename = dataMap.get("conCode") + ".pdf";
String filename = dataMap.get("conCode") + "."+type;
response.reset();
// 设置response的Header
response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes()));