From e2411fee13ff406db4aa5d994d7dcffdf4482cab Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 06 Sep 2023 14:22:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
index 6d20e73..40b248a 100644
--- a/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -6,6 +6,7 @@
import com.deepoove.poi.data.TextRenderData;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
+import cn.afterturn.easypoi.exception.word.WordExportException;
import cn.afterturn.easypoi.word.WordExportUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -36,6 +37,7 @@
import java.util.List;
import java.util.Map;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -348,7 +350,9 @@
map.put("table2", new MiniTableRenderData(header2, rsList2));
map.put("data",params.get("data").toString());
map.put("time",params.get("time").toString());
+
compile.render(map);
+// compile.write(new FileOutptStream("���������������������"+paramsu.get("time").toString()+".docx"));
compile.writeToFile("G:\\home\\mon1\\" + "���������������������"+params.get("time").toString()+".docx");
compile.close();
}
--
Gitblit v1.8.0