From a22377cd06933334360c41b888ef561c5efd4512 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 13 十一月 2023 09:44:23 +0800
Subject: [PATCH] 编号

---
 core/src/main/java/com/zt/life/export/service/WordFileService.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/com/zt/life/export/service/WordFileService.java b/core/src/main/java/com/zt/life/export/service/WordFileService.java
index 642234f..d1b3f77 100644
--- a/core/src/main/java/com/zt/life/export/service/WordFileService.java
+++ b/core/src/main/java/com/zt/life/export/service/WordFileService.java
@@ -19,13 +19,13 @@
 
 @Service
 public class WordFileService {
-    public void exportWordFile(HttpServletRequest request, WordFile wordFile, HttpServletResponse response) throws UnsupportedEncodingException, FileNotFoundException {
+    public void exportWordFile(HttpServletRequest request, Object dataObj, WordFile wordFile, HttpServletResponse response) throws UnsupportedEncodingException, FileNotFoundException {
         // 鏁版嵁map闆嗗悎
-        Map<String, Object> data = new HashMap<>();
+        Map<String, Object> wordData = new HashMap<>();
         //HackLoopTableRenderPolicy hackLoopTableRenderPolicy = new HackLoopTableRenderPolicy();
         Configure config = null;
         ConfigureBuilder builder = Configure.newBuilder();
-        this.formatWordData(wordFile, data, builder);
+        this.formatWordData(wordFile, wordData, builder);
 
         config = builder.build();
         File fl = new File(wordFile.getModulePath());
@@ -36,19 +36,19 @@
         } else {
             template = XWPFTemplate.compile(fs);
         }
-        template.render(data);
+        template.render(wordData);
         DownloadService.download(request, response, template, wordFile.getWordName());
     }
 
-    public void formatWordData(Object obj, Map<String, Object> data, ConfigureBuilder builder) {
-        Field[] fields = ReflectUtil.getFields(obj.getClass());
+    public void formatWordData(Object dataObj, Map<String, Object> wordData, ConfigureBuilder builder) {
+        Field[] fields = ReflectUtil.getFields(dataObj.getClass());
         for (Field field : fields) {
             field.setAccessible(true);
             String fieldName = field.getName();
             String typeName = field.getType().getName();
-            Object staticFieldValue = ReflectUtil.getFieldValue(obj, field.getName()); // 灞炴�у搴旂殑鏁版嵁
+            Object staticFieldValue = ReflectUtil.getFieldValue(dataObj, field.getName()); // 灞炴�у搴旂殑鏁版嵁
             if (typeName.contains("com.zt.life.modules")) {
-                formatWordData(staticFieldValue, data, builder);
+                formatWordData(staticFieldValue, wordData, builder);
             } else {
                 if (field.getType().getName().equals("java.util.List")) {
                     builder.bind(fieldName, new HackLoopTableRenderPolicy());
@@ -60,8 +60,8 @@
                         /*put("localbyte", new PictureRenderData(80, 100, ".png", new FileInputStream("./logo.png")));*/
                     }
                 }
-                if (data.get(fieldName) == null)
-                    data.put(fieldName, staticFieldValue);
+                if (wordData.get(fieldName) == null)
+                    wordData.put(fieldName, staticFieldValue);
             }
         }
     }

--
Gitblit v1.9.1