From 856f1cf8ee52443ce616ce00ecff7cbb7c30f000 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 01 Nov 2023 16:21:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/controller/CruiserController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 fb279b4..c3a5bea 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
@@ -26,6 +26,7 @@
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.xmlbeans.impl.jam.provider.ResourcePath;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ResourceUtils;
import org.springframework.web.bind.annotation.*;
@@ -234,6 +235,7 @@
* @return
*/
@PostMapping("dailyDustlds")
+ @Transactional
public ResultMessage dailyDustlds(@RequestBody Map<String,Object> params, HttpServletResponse response) throws IOException {
// Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
@@ -352,10 +354,13 @@
map.put("table3", new MiniTableRenderData(rsList3));
}
map.put("table1", new MiniTableRenderData(header1, rsList1));
- map.put("data",params.get("data"));
+ String data = params.get("data").toString();
+ map.put("data",data);
map.put("time",params.get("time").toString());
map.put("date1",params.get("date1").toString());
map.put("date2",params.get("date2").toString());
+// map.put("data",params.get("data").toString());
+ compile.render(map);
File docxFile = new File("���������������������.docx");
FileUtils.copyToFile(inputStream,docxFile);
compile = WordExportUtil.exportWord07(docxFile.getPath(),map);
--
Gitblit v1.8.0