From e039f5e9a3063eeec2c6c51f83e08beda0d1b5ca Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 09 Dec 2023 17:42:22 +0800
Subject: [PATCH] 填报word表格

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
index 3d67b66..77c8dc4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java
@@ -44,10 +44,13 @@
 
 	@GetMapping("/download/{resGuid}")
 	public ResponseEntity genera(HttpServletResponse response, @PathVariable String resGuid) throws Exception {
-		TbWordVO tbWordVO = sjztmdService.getTbWordVO(resGuid);
+		HashMap<String,Object> obj = sjztmdService.getTbWordVO(resGuid);
+
+		TbWordVO tbWordVO = (TbWordVO) obj.get("tbWordVO");
+		Map<String,Object> tableMap= (Map<String, Object>) obj.get("tableMap");
 
 		String fileName = resGuid + ".docx";
-		byte[] data = WordUtil.compileTemplateAndRenderData(tbWordVO);
+		byte[] data = WordUtil.compileTemplateAndRenderData(tbWordVO,tableMap);
 
 		// 创建响应实体并设置响应头,将输出流作为响应体返回给客户端
 		InputStreamResource resource = new InputStreamResource(new ByteArrayInputStream(data));
@@ -77,7 +80,7 @@
 
 		// 将临时文件添加到响应中,以便用户下载
 		return ResponseEntity.ok()
-			.contentType(MediaType.APPLICATION_OCTET_STREAM) // 设置响应的内容类型为二进制流(octet stream)
+			.contentType(MediaType.valueOf("application/vnd.openxmlformats-officedocument.wordprocessingml.document")) // 设置响应的内容类型为二进制流(octet stream)
 			.header("Content-Disposition", "attachment; filename=\"" + fileNameURL) // 设置响应的Content-Disposition头,以便浏览器提示用户下载文件
 			.body(resource); // 将InputStreamResource对象作为响应体
 	}

--
Gitblit v1.9.3