From e143a763c75da7cc020bf19259256c8155b5da96 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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..bb91bd2 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));
@@ -60,15 +63,15 @@
}
@GetMapping("/download/overFloodInfo")
- public ResponseEntity overFloodInfo() throws Exception{
+ public ResponseEntity overFloodInfo(String isShow) throws Exception{
String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
String fileName = time+ "全省水库防汛情况.docx";
String fileNameURL = URLEncoder.encode(fileName, "UTF-8");
//获取总览、大中库、明细数据
- List<TotalInfo> totalList = sjztmdService.getTotalInfo();
- List<DzkInfo> dzkList = sjztmdService.getDzkInfo();
- List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo();
- List<SzInfo> szInfoList = sjztmdService.getSzInfo();
+ List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
+ List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
+ List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
+ List<SzInfo> szInfoList = sjztmdService.getSzInfo(isShow);
byte[] data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList);
@@ -77,18 +80,18 @@
// 将临时文件添加到响应中，以便用户下载
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对象作为响应体
}
@GetMapping("/download/getOverFloodInfoExcel")
- public void getOverFloodInfoExcel(HttpServletResponse response) throws Exception {
+ public void getOverFloodInfoExcel(HttpServletResponse response,String isShow) throws Exception {
//获取总览、大中库、明细数据
- List<TotalInfo> totalList = sjztmdService.getTotalInfo();
- List<DzkInfo> dzkList = sjztmdService.getDzkInfo();
- List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo();
+ List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
+ List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
+ List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);
ExcelUtil.generateExcel(response,totalList,dzkList,overDetailList);
}
--
Gitblit v1.9.3