Finish Task #9031 Cost:3h 开发导出word

crm-print.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

office-plugin/office-plugin.iml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.7" level="project" />
-    <orderEntry type="library" name="Maven: org.openoffice:juh:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.openoffice:jurt:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.openoffice:ridl:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.openoffice:unoil:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.hyperic:sigar:1.6.5.132" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.12" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.6" level="project" />
-  </component>
-</module>

server/src/main/java/cn/keking/service/ContractService.java

@@ -230,7 +230,7 @@ public class ContractService {
     }
 
 
-    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());
@@ -259,10 +259,12 @@ public class ContractService {
             xwpfDocument.write(os);
             String outFilePath = Consts.uploadAbsDir()+ File.separator+ pdfName;
             officeToPdfService.openOfficeToPDF(pathFile, outFilePath);
-            //返回pdf
+            if("pdf".equals(type)){
-            return  new File(outFilePath);
+                //返回pdf
+                return  new File(outFilePath);
+            }
             //返回word
-            //return  new File(pathFile);
+            return  new File(pathFile);
         } finally {
             if (os != null) {
                 os.close();

server/src/main/java/cn/keking/web/controller/ContractController.java

@@ -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()));