From 07b356ba6331e4a0be8558d64bb3b5db804c4389 Mon Sep 17 00:00:00 2001
From: linzhijie <1003392067@qq.com>
Date: 星期二, 14 二月 2023 10:12:18 +0800
Subject: [PATCH] 多线程导出临时去除

---
 src/main/java/com/ots/common/utils/poi/WordUtil.java |  927 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 728 insertions(+), 199 deletions(-)

diff --git a/src/main/java/com/ots/common/utils/poi/WordUtil.java b/src/main/java/com/ots/common/utils/poi/WordUtil.java
index 3da7e4a..c3b47de 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -1,7 +1,10 @@
 package com.ots.common.utils.poi;
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.ots.common.enums.ReportTypeEnum;
 import com.ots.common.enums.ReportTypeNameEnum;
+import com.ots.common.enums.TableEnum;
 import com.ots.common.enums.TemplateTypeEnum;
 import com.ots.common.utils.StringUtils;
 import com.ots.framework.config.EssConfig;
@@ -9,14 +12,14 @@
 import com.ots.project.exam.domain.TReportTemplate;
 import com.ots.project.exam.dto.JAQTableStyle;
 import com.ots.project.exam.dto.WordParam;
+import com.ots.project.tool.PdfUtil;
 import com.ots.project.tool.ShellTool;
 import com.ots.project.tool.exam.ExamUtil;
 import com.ots.project.tool.exam.ImageUtil;
 import com.ots.project.tool.exam.ZipUtil;
-import com.ots.project.tool.report.JAQ.condition.Table1;
-import com.ots.project.tool.report.JAQ.condition.Table2;
-import com.ots.project.tool.report.JAQ.condition.Table3;
-import com.ots.project.tool.report.JAQ.condition.Table4;
+import com.ots.project.tool.libreoffice.LibreOfficeUtil;
+import com.ots.project.tool.report.MAQTR.chart.MAQTRChart;
+import com.ots.project.tool.report.PAQ.chart.PAQChart;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.ooxml.POIXMLDocument;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -30,9 +33,7 @@
 import org.openxmlformats.schemas.drawingml.x2006.chart.*;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTGraphicalObject;
 import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTAnchor;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTDrawing;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
@@ -40,6 +41,8 @@
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class WordUtil {
     private static final Logger log = LoggerFactory.getLogger(WordUtil.class);
@@ -52,18 +55,18 @@
         put("<FontSize_11>", "</FontSize_11>");
     }};
     public static final int DEFAULT_FONT_SIZE = 10;
-    
+
     public static boolean changWord(String inputUrl, String outputUrl,
                                     Map<String, Object> textMap, Map<String, Object> tableMap) {
-        
+
         try {
-            
+
             XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(inputUrl));
-            
+
             WordUtil.changeText(document, textMap);
-            
+
             WordUtil.changeTable(document, textMap);
-            
+
             File file = new File(outputUrl);
             FileOutputStream stream = new FileOutputStream(file);
             document.write(stream);
@@ -77,15 +80,15 @@
     }
     public static OutputStream getReportWord(String inputUrl, String outputUrl,
                                              Map<String, Object> textMap, Map<String, Object> tableMap) {
-        
+
         try {
-            
+
             XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(inputUrl));
-            
+
             WordUtil.changeText(document, textMap);
-            
+
             WordUtil.changeTable(document, textMap);
-            
+
             File file = new File(outputUrl);
             return new FileOutputStream(file);
         } catch (IOException e) {
@@ -97,14 +100,14 @@
     }
     public static boolean changWord(String inputUrl, String outputUrl,
                                     Map<String, Object> textMap, WordParam wordParam) {
-        
+
         boolean changeFlag = true;
         try {
-            
+
             XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(inputUrl));
-            
+
             WordUtil.changeText(document, textMap);
-            
+
             File file = new File(outputUrl);
             FileOutputStream stream = new FileOutputStream(file);
             document.write(stream);
@@ -116,12 +119,12 @@
         }
         return changeFlag;
     }
-    
+
     public static void changeText(XWPFDocument document, Map<String, Object> textMap) throws IOException, InvalidFormatException {
-        
+
         setHeader(document, textMap);
-        
-        
+
+
         List<IBodyElement> elements = document.getBodyElements();
         List<XWPFParagraph> paragraphs = new ArrayList<>();
         for (IBodyElement iBodyElement : elements) {
@@ -130,10 +133,10 @@
             }
         }
         for (XWPFParagraph paragraph : paragraphs) {
-            
+
             String text = paragraph.getText();
             if (checkText(text)) {
-                
+
                 List<IRunElement> iRunElements = paragraph.getIRuns();
                 List<XWPFRun> runs = new ArrayList<>();
                 for (IRunElement iRunElement : iRunElements) {
@@ -141,19 +144,19 @@
                 }
                 int runPosition = 0;
                 for (XWPFRun run : runs) {
-                    
+
                     String changeValueStr = changeValue(run.toString(), textMap, run, paragraph, document, runPosition);
                     if (!StringUtils.equals(changeValueStr, "NoChangValue")) {
                         run.setText(changeValueStr, 0);
                     }
                     runPosition++;
                 }
-                
-                
+
+
             }
         }
     }
-    
+
     private static void setHeader(XWPFDocument document, Map<String, Object> textMap) {
         try {
             List<XWPFHeader> headerList = document.getHeaderList();
@@ -177,6 +180,9 @@
                 if (run.toString().indexOf("%TTime%") != -1) {
                     run.setText(textMap.get("reportGenerationDate").toString(), 0);
                 }
+                if (run.toString().indexOf("%LIBSAQGS0018%") != -1) {
+                    run.setText(textMap.get("LIBSAQGS0018").toString(), 0);
+                }
             }
         }
     }
@@ -194,15 +200,15 @@
         setTableValue(document, textMap, tables);
     }
     public static void changePage(XWPFDocument document) throws IOException, org.apache.poi.openxml4j.exceptions.InvalidFormatException {
-        
+
         List<XWPFParagraph> paragraphs = document.getParagraphs();
         for (XWPFParagraph paragraph : paragraphs) {
-            
+
             String text = paragraph.getText();
             if (text.indexOf("%page-change%") != -1) {
                 List<XWPFRun> runs = paragraph.getRuns();
                 for (XWPFRun run : runs) {
-                    
+
                     if (StringUtils.equals(run.toString(), "%page-change%")) {
                         run.setText("", 0);
                     }
@@ -212,15 +218,15 @@
         }
     }
     public static void changeLine(XWPFDocument document) throws IOException, org.apache.poi.openxml4j.exceptions.InvalidFormatException {
-        
+
         List<XWPFParagraph> paragraphs = document.getParagraphs();
         for (XWPFParagraph paragraph : paragraphs) {
-            
+
             String text = paragraph.getText();
             if (text.indexOf("%line-feed%") != -1) {
                 List<XWPFRun> runs = paragraph.getRuns();
                 for (XWPFRun run : runs) {
-                    
+
                     if (StringUtils.equals(run.toString(), "%line-feed%")) {
                         run.setText("", 0);
                         run.addBreak();
@@ -231,7 +237,7 @@
     }
     private static void setPicture(XWPFRun run, WordParam wordParam) throws org.apache.poi.openxml4j.exceptions.InvalidFormatException, IOException {
         InputStream in = new FileInputStream(wordParam.getContent());
-        
+
         BufferedImage bufferedImage = ImageUtil.getImage(wordParam.getContent());
         int width = (int) Math.round(bufferedImage.getWidth());
         int height = (int) Math.round(bufferedImage.getHeight());
@@ -239,10 +245,10 @@
         run.addPicture(in, Document.PICTURE_TYPE_PNG, "TEST", width * emuSelf, height * emuSelf);
         in.close();
         if (wordParam.isMove()) {
-            
+
             CTDrawing drawing = run.getCTR().getDrawingArray(0);
             CTGraphicalObject graphicalobject = drawing.getInlineArray(0).getGraphic();
-            
+
             CTAnchor anchor = getAnchorWithGraphic(graphicalobject, "TEST1",
                     Units.toEMU(wordParam.getPicWidth()), Units.toEMU(wordParam.getPicHeight()),
                     Units.toEMU(wordParam.getX()), Units.toEMU(wordParam.getY()), false, wordParam.getTopPosition());
@@ -250,11 +256,11 @@
             drawing.removeInline(0);
         }
     }
-    
+
     public static CTAnchor getAnchorWithGraphic(CTGraphicalObject ctGraphicalObject,
                                                 String deskFileName, int width, int height,
                                                 int leftOffset, int topOffset, boolean behind, int topPosition) {
-        long relativeHeight = 251649024l + topPosition;
+        long relativeHeight = 251649024L + topPosition;
         String anchorXML =
                 "<wp:anchor xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" "
                         + "simplePos=\"0\" relativeHeight=\"" + relativeHeight + "\" behindDoc=\"" + ((behind) ? 1 : 0) + "\" locked=\"0\" layoutInCell=\"1\" allowOverlap=\"1\">"
@@ -280,24 +286,35 @@
         anchor.setGraphic(ctGraphicalObject);
         return anchor;
     }
-    
+
     public static void changeTable(XWPFDocument document, Map<String, Object> textMap) {
-        
+
         List<XWPFTable> tables = document.getTables();
         setTableValue(document, textMap, tables);
     }
+
+    /**
+     * 璁剧疆琛ㄦ牸鍊�
+     * @param document
+     * @param textMap
+     * @param tables
+     */
     private static void setTableValue(XWPFDocument document, Map<String, Object> textMap, List<XWPFTable> tables) {
         for (int i = 0; i < tables.size(); i++) {
-            
+
             log.info("绗�" + (i + 1) + "涓〃锛�");
             try {
                 XWPFTable table = tables.get(i);
                 if (table.getRows().size() > 0) {
-                    
+                    log.info("琛ㄨ鏁�:{}",table.getRows().size());
                     log.info("琛ㄦ牸鏁版嵁锛�" + table.getText());
+                    //澧炲姞琛ㄦ牸鎴栬�呮笡灏戣〃鏍�
+                    if (Objects.equals(textMap.get("sendEmailFileName"), ReportTypeEnum.JAQ.getCode())) {
+                        addOrDelTableRow(table,i,textMap);
+                    }
                     if (checkText(table.getText())) {
                         List<XWPFTableRow> rows = table.getRows();
-                        
+
                         eachTable(rows, textMap, document);
                     }
                 }
@@ -306,21 +323,432 @@
             }
         }
     }
-    
+
+    /**
+     * 澧炲姞琛ㄦ牸鎴栬�呮笡灏戣〃鏍�
+     * @param table 琛ㄦ牸
+     * @param index 琛ㄧ储寮�
+     * @param textMap 璧嬪�煎璞�
+     */
+    private static void addOrDelTableRow(XWPFTable table, int index, Map<String, Object> textMap) {
+
+        try {
+            TableEnum tableEnum = TableEnum.codeOf(index);
+            Integer tableNum = Integer.valueOf(textMap.get(tableEnum.getName()).toString());
+            Integer rows = table.getRows().size();
+
+            //琛�1-琛�3 闇�鍓旈櫎琛ㄥご
+            Integer contentRows = rows - 1;
+            //琛�4 闇�鍓旈櫎琛ㄥご璺熷熬閮ㄩ鐣欒鏁�
+            if(tableEnum == TableEnum.table4){
+                contentRows -= 5;
+                rows -= 5;
+
+                //琛�4 琛屼负琛ㄧ幇涓句緥澶勭悊
+                Integer table4ChildrenNum = Integer.valueOf(textMap.get(TableEnum.table4Children.getName()).toString());
+                if(table4ChildrenNum != null && table4ChildrenNum != 3){
+                    if(table4ChildrenNum > 3){
+                        //杩藉姞
+                        for (int i = 1; i < rows; i++) {
+                            XWPFTableRow row = table.getRows().get(i);
+                            List<XWPFTableCell> cells = row.getTableCells();
+                            XWPFTableCell cell = cells.get(1);
+                            XWPFParagraph paragraph = cell.getParagraphs().get(0);
+                            for (int j = 3; j < cell.getParagraphs().size(); j++) {
+                                //log.info(cell.getParagraphs().get(j).getText()+"");
+                                //璁剧疆鏍峰紡
+                                cell.getParagraphs().get(j).getCTP().setPPr(cell.getParagraphs().get(0).getCTP().getPPr());
+                                if (paragraph.getRuns() != null
+                                        && paragraph.getRuns().size() > 0) {
+                                    XWPFRun cellR = cell.getParagraphs().get(j).createRun();
+                                    cellR.setBold(paragraph.getRuns().get(0).isBold());
+                                    cellR.getCTR().setRPr(paragraph.getRuns().get(0).getCTR().getRPr());
+                                }
+                                //鏇挎崲鏂囧瓧
+                                changeText(cell.getParagraphs().get(j),"%T4com"+i+"item"+(j+1)+"%");
+                            }
+                        }
+                    }else{
+                        //鍑忓皯
+                        for (int i = 1; i < rows; i++) {
+                            XWPFTableRow row = table.getRows().get(i);
+                            List<XWPFTableCell> cells = row.getTableCells();
+                            XWPFTableCell cell = cells.get(1);
+                            //XWPFParagraph paragraph = cell.getParagraphs().get(0);
+                            for (int j = 3; j > table4ChildrenNum; j--) {
+                                //cell.removeParagraph(j-1);
+                                changeText(cell.getParagraphs().get(j),"");
+                            }
+                        }
+                    }
+                }
+            }
+
+            //闄愬埗琛屾暟涓嶄负绌� 鍜� 闄愬埗琛屾暟璺熸姤鍛婄幇鏈変笉涓�鑷撮渶杩涜澶勭悊
+            if(tableNum != null && !tableNum.equals(contentRows)){
+                if(tableNum > contentRows){
+                    //澧炲姞琛屾暟
+                    Integer addRow = tableNum - contentRows;
+                    log.info("{}澧炲姞{}琛�",tableEnum.getName(),addRow);
+                    for (int i = rows; i < rows+addRow; i++) {
+                        addJAQTable(table,tableEnum,i,textMap);
+                    }
+
+                }else{
+                    //鍑忓皯琛屾暟
+                    Integer delRow = rows - tableNum;
+                    for (int i = contentRows; i > rows-delRow; i--) {
+                        delJAQTable(table,i);
+                    }
+                    log.info("{}鍑忓皯{}琛屾暟",TableEnum.codeOf(index).getName(),delRow-1);
+                }
+            }
+
+            //琛�4 鑳滀换鍔涢鐣欎綅缃簭鍙峰鐞�
+            if(tableEnum == TableEnum.table4){
+                if(tableNum != null && tableNum != 8){
+                    for (int i = tableNum; i <= tableNum + 4; i++) {
+                        if(i+2 > table.getRows().size()){
+                            continue;
+                        }
+                        XWPFTableRow row = table.getRows().get(i+2);
+                        List<XWPFTableCell> cells = row.getTableCells();
+                        changeText(cells.get(0).getParagraphs().get(0),"#"+(i+1)+".");
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            log.info("琛▄}澧炲姞琛ㄦ牸鎴栬�呮笡灏戣〃鏍煎紓甯�",index+1);
+        }
+    }
+
+    /**
+     * 鏇挎崲娈佃惤閲岄潰鐨勫彉閲�
+     * @param para
+     * @param text
+     */
+    private static void replaceInPara(XWPFParagraph para, String text) {
+        List<XWPFRun> runs;
+        runs = para.getRuns();
+        XWPFRun run = runs.get(0);
+        // 鐩存帴璋冪敤XWPFRun鐨剆etText()鏂规硶璁剧疆鏂囨湰鏃讹紝鍦ㄥ簳灞備細閲嶆柊鍒涘缓涓�涓猉WPFRun锛屾妸鏂囨湰闄勫姞鍦ㄥ綋鍓嶆枃鏈悗闈紝
+        // 鎵�浠ユ垜浠笉鑳界洿鎺ヨ鍊硷紝闇�瑕佸厛鍒犻櫎褰撳墠run,鐒跺悗鍐嶈嚜宸辨墜鍔ㄦ彃鍏ヤ竴涓柊鐨剅un銆�
+        para.removeRun(0);
+        para.insertNewRun(0).setText(text);
+    }
+
+    public static void changeText(XWPFParagraph p, String newText) {
+        List<XWPFRun> runs = p.getRuns();
+        if(runs.isEmpty()){
+            p.createRun();
+        }
+        for(int i = runs.size() - 1; i > 0; i--) {
+            p.removeRun(i);
+        }
+        XWPFRun run = runs.get(0);
+        run.setText(newText, 0);
+    }
+
+    /**
+     * 鍒犻櫎JAQ琛ㄦ牸
+     * @param table
+     * @param index
+     */
+    private static void delJAQTable(XWPFTable table,Integer index){
+        table.removeRow(index);
+    }
+
+    /**
+     * 娣诲姞JAQ琛ㄦ牸
+     * @param tableEnum
+     * @param index
+     */
+    private static void addJAQTable(XWPFTable table,TableEnum tableEnum,Integer index,Map<String, Object> textMap){
+
+        // 鍦ㄨ〃鏍间腑鎸囧畾鐨勪綅缃柊澧炰竴琛�
+        insertRow(table,1,index);
+
+        XWPFTableRow row = table.getRows().get(index);
+        List<XWPFTableCell> cells = row.getTableCells();
+        switch (tableEnum){
+            case table1:
+                cells.get(0).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T1rank"+index)+"");
+                cells.get(1).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T1com"+index)+"");
+                cells.get(2).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T1com"+index+"IF_M")+"");
+                cells.get(3).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T1com"+index+"IF_L")+"-"+textMap.get("T1com"+index+"IF_H"));
+                break;
+            case table2:
+                cells.get(0).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T2rank"+index)+"");
+                cells.get(1).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T2com"+index)+"");
+                cells.get(2).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T2Com"+index+"I_M")+"");
+                cells.get(3).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T2com"+index+"I_L")+"-"+textMap.get("T2com"+index+"I_H"));
+                break;
+            case table3:
+                cells.get(0).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T3rank"+index)+"");
+                cells.get(1).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T3item"+index)+"");
+                cells.get(2).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T3item"+index+"IF_M")+"");
+                cells.get(3).getParagraphs().get(0).getRuns().get(0).setText(textMap.get("T3com"+index)+"");
+                break;
+            case table4:
+                cells.get(0).getParagraphs().get(0).getRuns().get(0).setText("#"+textMap.get("T4rank"+index)+".  "+textMap.get("T4com"+index));
+
+                //瀛愰泦鍚堥暱搴�
+                Integer table4ChildrenNum = Integer.valueOf(textMap.get(TableEnum.table4Children.getName()).toString());
+                List<String> items = new ArrayList<>();
+                for (int j = 1; j <= table4ChildrenNum; j++) {
+                    items.add(textMap.get("T4com"+index+"item"+j)+"");
+                }
+
+                //璁剧疆鍊�
+                XWPFTableCell cell = cells.get(1);
+                XWPFParagraph paragraph = cell.getParagraphs().get(0);
+                for (int i = 0; i < items.size(); i++) {
+                    String item = items.get(i);
+                    if(i == 0){
+                        paragraph.getRuns().get(0).setText(item);
+                    }else{
+                        //鏂板娈佃惤
+                        cell.addParagraph();
+                        cell.getParagraphs().get(i).getCTP().setPPr(paragraph.getCTP().getPPr());
+                        if (paragraph.getRuns() != null
+                                && paragraph.getRuns().size() > 0) {
+                            XWPFRun cellR = cell.getParagraphs().get(i).createRun();
+                            cellR.setBold(paragraph.getRuns().get(0).isBold());
+                            /*cellR.setFontSize(paragraph.getRuns().get(0).getFontSize());
+                            cellR.setFontFamily(paragraph.getRuns().get(0).getFontFamily());*/
+                            cellR.getCTR().setRPr(paragraph.getRuns().get(0).getCTR().getRPr());
+                        }
+                        cell.getParagraphs().get(i).getRuns().get(0).setText(item);
+                    }
+                }
+
+                //灏忎簬6涓儨浠诲姏 琛ラ綈
+                Integer repair = 6 - table4ChildrenNum;
+                if(repair > 0){
+                    for (int i = 0; i < repair; i++) {
+                        //鏂板娈佃惤
+                        cell.addParagraph();
+                        cell.getParagraphs().get(cell.getParagraphs().size()-1).getCTP().setPPr(paragraph.getCTP().getPPr());
+                        if (paragraph.getRuns() != null
+                                && paragraph.getRuns().size() > 0) {
+                            XWPFRun cellR = cell.getParagraphs().get(cell.getParagraphs().size()-1).createRun();
+                            cellR.setBold(paragraph.getRuns().get(0).isBold());
+                            /*cellR.setFontSize(paragraph.getRuns().get(0).getFontSize());
+                            cellR.setFontFamily(paragraph.getRuns().get(0).getFontFamily());*/
+                            cellR.getCTR().setRPr(paragraph.getRuns().get(0).getCTR().getRPr());
+                        }
+                        cell.getParagraphs().get(cell.getParagraphs().size()-1).getRuns().get(0).setText(null);
+                    }
+                }
+                break;
+        }
+    }
+
+    /**
+     * insertRow 鍦╳ord琛ㄦ牸涓寚瀹氫綅缃彃鍏ヤ竴琛岋紝骞跺皢鏌愪竴琛岀殑鏍峰紡澶嶅埗鍒版柊澧炶
+     * @param copyrowIndex 闇�瑕佸鍒剁殑琛屼綅缃�
+     * @param newrowIndex 闇�瑕佹柊澧炰竴琛岀殑浣嶇疆
+     * */
+    public static void insertRow(XWPFTable table, int copyrowIndex, int newrowIndex) {
+        // 鍦ㄨ〃鏍间腑鎸囧畾鐨勪綅缃柊澧炰竴琛�
+        XWPFTableRow targetRow = table.insertNewTableRow(newrowIndex);
+        // 鑾峰彇闇�瑕佸鍒惰瀵硅薄
+        XWPFTableRow copyRow = table.getRow(copyrowIndex);
+        //澶嶅埗琛屽璞�
+        targetRow.getCtRow().setTrPr(copyRow.getCtRow().getTrPr());
+        //鎴栬闇�瑕佸鍒剁殑琛岀殑鍒�
+        List<XWPFTableCell> copyCells = copyRow.getTableCells();
+        //澶嶅埗鍒楀璞�
+        XWPFTableCell targetCell = null;
+        for (int i = 0; i < copyCells.size(); i++) {
+            XWPFTableCell copyCell = copyCells.get(i);
+            targetCell = targetRow.addNewTableCell();
+            targetCell.getCTTc().setTcPr(copyCell.getCTTc().getTcPr());
+            if (copyCell.getParagraphs() != null && copyCell.getParagraphs().size() > 0) {
+                targetCell.getParagraphs().get(0).getCTP().setPPr(copyCell.getParagraphs().get(0).getCTP().getPPr());
+                if (copyCell.getParagraphs().get(0).getRuns() != null
+                        && copyCell.getParagraphs().get(0).getRuns().size() > 0) {
+                    XWPFRun cellR = targetCell.getParagraphs().get(0).createRun();
+                    cellR.setBold(copyCell.getParagraphs().get(0).getRuns().get(0).isBold());
+                    cellR.getCTR().setRPr(copyCell.getParagraphs().get(0).getRuns().get(0).getCTR().getRPr());
+                }
+            }
+        }
+    }
+
+    /**
+     *  澶嶅埗妯℃澘琛岀殑灞炴��
+     * @param tmpCell
+     * @param cell
+     * @param text
+     * @throws Exception
+     */
+    private static void setCellText(XWPFTableCell tmpCell, XWPFTableCell cell,String text){
+        try {
+            CTTc cttc2 = tmpCell.getCTTc();
+            CTTcPr ctPr2 = cttc2.getTcPr();
+            CTTc cttc = cell.getCTTc();
+            CTTcPr ctPr = cttc.addNewTcPr();
+            if (ctPr2.getTcW() != null) {
+                ctPr.addNewTcW().setW(ctPr2.getTcW().getW());
+            }
+            if (ctPr2.getVAlign() != null) {
+                ctPr.addNewVAlign().setVal(ctPr2.getVAlign().getVal());
+            }
+            if (cttc2.getPList().size() > 0) {
+                CTP ctp = cttc2.getPList().get(0);
+                if (ctp.getPPr() != null) {
+                    if (ctp.getPPr().getJc() != null) {
+                        cttc.getPList().get(0).addNewPPr().addNewJc()
+                                .setVal(ctp.getPPr().getJc().getVal());
+                    }
+                }
+            }
+            if (ctPr2.getTcBorders() != null) {
+                ctPr.setTcBorders(ctPr2.getTcBorders());
+            }
+            XWPFParagraph tmpP = tmpCell.getParagraphs().get(0);
+            XWPFParagraph cellP = cell.getParagraphs().get(0);
+            XWPFRun tmpR = null;
+            if (tmpP.getRuns() != null && tmpP.getRuns().size() > 0) {
+                tmpR = tmpP.getRuns().get(0);
+            }
+            XWPFRun cellR = cellP.createRun();
+            cellR.setText(text);
+            // 澶嶅埗瀛椾綋淇℃伅
+            if (tmpR != null) {
+                if(!cellR.isBold()){
+                    cellR.setBold(tmpR.isBold());
+                }
+                cellR.setItalic(tmpR.isItalic());
+                cellR.setUnderline(tmpR.getUnderline());
+                cellR.setColor(tmpR.getColor());
+                cellR.setTextPosition(tmpR.getTextPosition());
+                if (tmpR.getFontSize() != -1) {
+                    cellR.setFontSize(tmpR.getFontSize());
+                }
+                if (tmpR.getFontFamily() != null) {
+                    cellR.setFontFamily(tmpR.getFontFamily());
+                }
+                if (tmpR.getCTR() != null) {
+                    if (tmpR.getCTR().isSetRPr()) {
+                        CTRPr tmpRPr = tmpR.getCTR().getRPr();
+                        if (tmpRPr.isSetRFonts()) {
+                            CTFonts tmpFonts = tmpRPr.getRFonts();
+                            CTRPr cellRPr = cellR.getCTR().isSetRPr() ? cellR
+                                    .getCTR().getRPr() : cellR.getCTR().addNewRPr();
+                            CTFonts cellFonts = cellRPr.isSetRFonts() ? cellRPr
+                                    .getRFonts() : cellRPr.addNewRFonts();
+                            cellFonts.setAscii(tmpFonts.getAscii());
+                            cellFonts.setAsciiTheme(tmpFonts.getAsciiTheme());
+                            cellFonts.setCs(tmpFonts.getCs());
+                            cellFonts.setCstheme(tmpFonts.getCstheme());
+                            cellFonts.setEastAsia(tmpFonts.getEastAsia());
+                            cellFonts.setEastAsiaTheme(tmpFonts.getEastAsiaTheme());
+                            cellFonts.setHAnsi(tmpFonts.getHAnsi());
+                            cellFonts.setHAnsiTheme(tmpFonts.getHAnsiTheme());
+                        }
+                    }
+                }
+            }
+            // 澶嶅埗娈佃惤淇℃伅
+            cellP.setAlignment(tmpP.getAlignment());
+            cellP.setVerticalAlignment(tmpP.getVerticalAlignment());
+            cellP.setBorderBetween(tmpP.getBorderBetween());
+            cellP.setBorderBottom(tmpP.getBorderBottom());
+            cellP.setBorderLeft(tmpP.getBorderLeft());
+            cellP.setBorderRight(tmpP.getBorderRight());
+            cellP.setBorderTop(tmpP.getBorderTop());
+            cellP.setPageBreak(tmpP.isPageBreak());
+            if (tmpP.getCTP() != null) {
+                if (tmpP.getCTP().getPPr() != null) {
+                    CTPPr tmpPPr = tmpP.getCTP().getPPr();
+                    CTPPr cellPPr = cellP.getCTP().getPPr() != null ? cellP
+                            .getCTP().getPPr() : cellP.getCTP().addNewPPr();
+                    // 澶嶅埗娈佃惤闂磋窛淇℃伅
+                    CTSpacing tmpSpacing = tmpPPr.getSpacing();
+                    if (tmpSpacing != null) {
+                        CTSpacing cellSpacing = cellPPr.getSpacing() != null ? cellPPr
+                                .getSpacing() : cellPPr.addNewSpacing();
+                        if (tmpSpacing.getAfter() != null) {
+                            cellSpacing.setAfter(tmpSpacing.getAfter());
+                        }
+                        if (tmpSpacing.getAfterAutospacing() != null) {
+                            cellSpacing.setAfterAutospacing(tmpSpacing
+                                    .getAfterAutospacing());
+                        }
+                        if (tmpSpacing.getAfterLines() != null) {
+                            cellSpacing.setAfterLines(tmpSpacing.getAfterLines());
+                        }
+                        if (tmpSpacing.getBefore() != null) {
+                            cellSpacing.setBefore(tmpSpacing.getBefore());
+                        }
+                        if (tmpSpacing.getBeforeAutospacing() != null) {
+                            cellSpacing.setBeforeAutospacing(tmpSpacing
+                                    .getBeforeAutospacing());
+                        }
+                        if (tmpSpacing.getBeforeLines() != null) {
+                            cellSpacing.setBeforeLines(tmpSpacing.getBeforeLines());
+                        }
+                        if (tmpSpacing.getLine() != null) {
+                            cellSpacing.setLine(tmpSpacing.getLine());
+                        }
+                        if (tmpSpacing.getLineRule() != null) {
+                            cellSpacing.setLineRule(tmpSpacing.getLineRule());
+                        }
+                    }
+                    // 澶嶅埗娈佃惤缂╄繘淇℃伅
+                    CTInd tmpInd = tmpPPr.getInd();
+                    if (tmpInd != null) {
+                        CTInd cellInd = cellPPr.getInd() != null ? cellPPr.getInd()
+                                : cellPPr.addNewInd();
+                        if (tmpInd.getFirstLine() != null) {
+                            cellInd.setFirstLine(tmpInd.getFirstLine());
+                        }
+                        if (tmpInd.getFirstLineChars() != null) {
+                            cellInd.setFirstLineChars(tmpInd.getFirstLineChars());
+                        }
+                        if (tmpInd.getHanging() != null) {
+                            cellInd.setHanging(tmpInd.getHanging());
+                        }
+                        if (tmpInd.getHangingChars() != null) {
+                            cellInd.setHangingChars(tmpInd.getHangingChars());
+                        }
+                        if (tmpInd.getLeft() != null) {
+                            cellInd.setLeft(tmpInd.getLeft());
+                        }
+                        if (tmpInd.getLeftChars() != null) {
+                            cellInd.setLeftChars(tmpInd.getLeftChars());
+                        }
+                        if (tmpInd.getRight() != null) {
+                            cellInd.setRight(tmpInd.getRight());
+                        }
+                        if (tmpInd.getRightChars() != null) {
+                            cellInd.setRightChars(tmpInd.getRightChars());
+                        }
+                    }
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
     private static void addTableValue(XWPFDocument document, Map<Integer, Map<Integer, List<String[]>>> autoTableMap) {
         if (Objects.isNull(autoTableMap)) {
             return;
         }
         List<XWPFTable> tables = document.getTables();
         for (int i = 0; i < tables.size(); i++) {
-            
+
             log.info("绗�" + (i + 1) + "涓〃锛�");
             try {
                 XWPFTable table = tables.get(i);
                 if (table.getRows().size() > 0) {
-                    
+
                     log.info("娣诲姞琛岃〃鏍兼暟鎹細" + table.getText());
-                    
+
                     Map<Integer, List<String[]>> mapRowsMap = autoTableMap.get(i);
                     log.info("鎻掑叆" + table.getText());
                     insertTable(table, mapRowsMap.get(i), 1);
@@ -330,7 +758,7 @@
             }
         }
     }
-    private static void setTableMap(Map<String, Object> tableMap, Map<Integer, List<String[]>> mapRowsMap) {
+   /* private static void setTableMap(Map<String, Object> tableMap, Map<Integer, List<String[]>> mapRowsMap) {
         if (Objects.isNull(tableMap) || tableMap.isEmpty()) {
             return;
         }
@@ -362,13 +790,13 @@
             table4List.add(t.toRow());
         }
         mapRowsMap.put(3, table4List);
-    }
-    
+    }*/
+
     public static void eachTable(List<XWPFTableRow> rows, Map<String, Object> textMap, XWPFDocument document) throws IOException, org.apache.poi.openxml4j.exceptions.InvalidFormatException {
         for (XWPFTableRow row : rows) {
             List<XWPFTableCell> cells = row.getTableCells();
             for (XWPFTableCell cell : cells) {
-                
+
                 //濡傛灉褰撳墠琛ㄦ牸鍖呭惈%灏变唬琛ㄩ渶瑕佹浛鎹�
                 if (checkText(cell.getText())) {
                     List<XWPFParagraph> paragraphs = cell.getParagraphs();
@@ -391,21 +819,20 @@
         }
     }
     private static void setTextValue(Map<String, Object> textMap, XWPFDocument document, XWPFParagraph paragraph, int runPosition, XWPFRun run) {
-        System.out.println("琛ㄦ牸鐨勶細" + run.toString());
+        log.info("琛ㄦ牸鐨勶細{}", run.toString());
         try {
             run.setText(changeValue(run.toString(), textMap, run, paragraph, document, runPosition), 0);
         } catch (Exception e) {
-            
-            
+            e.printStackTrace();
         }
     }
-    
+
     public static void insertTable(XWPFTable table, List<String[]> tableList, int inserRowNum) {
-        
+
         for (int i = 0; i < tableList.size(); i++) {
             XWPFTableRow row = table.createRow();
         }
-        
+
         XWPFTableRow headXwpfTableRow = table.getRows().get(0);
         for (int i = inserRowNum; i <= tableList.size(); i++) {
             XWPFTableRow newRow = table.getRow(i);
@@ -414,26 +841,44 @@
                 try {
                     XWPFTableCell cell = cells.get(j);
                     cell.setText(tableList.get(i - 1)[j]);
-                    
+
                     cell.getParagraphs().get(0).getCTP().setPPr(headXwpfTableRow.getCell(0).getParagraphs().get(0).getCTP().getPPr());
                 } catch (Exception e) {
                 }
             }
         }
     }
-    
+
+    //鏍¢獙鏂囨湰鏄惁闇�瑕佹浛鎹�
     public static boolean checkText(String text) {
+        //鏇挎崲鏂囨湰鍖呭惈%
         if (text.indexOf("%") != -1 || StringUtils.equals(text, "N/A NONE")) {
-            return true;
+            //鍙湁%澶т簬1 鎵嶉�氳繃
+            if(getCount(text) > 1){
+                return true;
+            }
+            return false;
         }
         return false;
     }
-    
+
+    //鍒ゆ柇%鍑虹幇鐨勬鏁�
+    public static int getCount(String text){
+        //鏃ч暱搴�
+        int oldLength = text.length();
+        text = text.replace("%", "");
+        //鏂伴暱搴�
+        int newLength = text.length();
+        //鍑虹幇娆℃暟 = 鏃ч暱搴� - 鏂伴暱搴�
+        int count = oldLength - newLength;
+        return count;
+    }
+
     public static String changeValue(String runValue, Map<String, Object> textMap, XWPFRun run, XWPFParagraph paragraph, XWPFDocument document, int runPosition) throws IOException, org.apache.poi.openxml4j.exceptions.InvalidFormatException {
-        
+        log.debug("changeText:{}",runValue);
         Set<Map.Entry<String, Object>> textSets = textMap.entrySet();
         for (Map.Entry<String, Object> textSet : textSets) {
-            
+
             String key = "%" + textSet.getKey() + "%";
             if (runValue.indexOf("%page-change%") != -1) {
                 runValue = "";
@@ -448,23 +893,27 @@
                 if (runValue.indexOf("<BoldText>") != -1) {
                     return setOtherStyle(runValue, paragraph, runPosition, run);
                 }
-                break;
+                //鏈変簺琛ㄦ牸鍙兘瀛樺湪澶氫釜瀛楀吀 闇�鏇挎崲澶氭涓嶈兘杞绘槗break
+                //娌℃湁鍙浛鎹㈠唴瀹圭洿鎺reak
+                if(getTextSize(runValue) == 0){
+                    break;
+                }
             }
         }
-        
+
         if (checkText(runValue)) {
             runValue = runValue.replaceAll("%.*%", "");
             runValue = runValue.replaceAll("N/A NONE", "");
-            
+
         }
-        
+
         return runValue;
     }
     private static String setOtherStyle(String runValue, XWPFParagraph paragraph, int runPosition, XWPFRun oldRun) {
-        
-        
-        
-        
+
+
+
+
         int position = 0;
         int pointer = 0;
         int end = runValue.length();
@@ -490,12 +939,12 @@
                 if (StringUtils.isNotEmpty(newRunStr)) {
                     newRunStr = newRunStr.replaceAll("<BoldText>", "");
                     newRunStr = newRunStr.replaceAll("</BoldText>", "");
-                    
+
                     String rgbStr = getRGBStr(newRunStr, oldRun);
                     if (rgbStr == null) {
                         rgbStr = oldRun.getColor();
                     }
-                    
+
                     int fontSize = getFontSize(newRunStr, oldRun);
                     if (fontSize == -1) {
                         fontSize = oldRun.getFontSize();
@@ -523,7 +972,7 @@
                 pointer = end;
             }
         }
-        
+
         paragraph.removeRun(runPosition);
         return "NoChangValue";
     }
@@ -594,40 +1043,8 @@
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     private static void changOtherPicture(XWPFParagraph paragraph) {
-        
+
         String paragraphText = paragraph.getText();
         if (paragraphText.indexOf("{start.png}") == -1) {
             return;
@@ -643,22 +1060,22 @@
             position = paragraphText.indexOf("{start.png}", position);
             String value = "";
             if (position == -1) {
-                
+
                 runPosition = insertPicRun(paragraph, oldRun, runPosition, paragraphText.substring(poiter, end));
                 break;
             }
             if (poiter == position) {
                 position = position + starLength;
-                
+
                 runPosition = insertSmallRunPic(paragraph, runPosition);
                 poiter = position;
                 continue;
             } else {
-                
+
                 runPosition = insertPicRun(paragraph, oldRun, runPosition, paragraphText.substring(poiter, position));
                 poiter = position;
                 position = poiter + starLength;
-                
+
                 runPosition = insertSmallRunPic(paragraph, runPosition);
                 poiter = position;
             }
@@ -694,26 +1111,31 @@
         insertRun.setFontSize((fontSize == -1) ? DEFAULT_FONT_SIZE : fontSize);
         return runPosition;
     }
-    
+
     private static String changeWordAndPicValue(String runValue, XWPFRun run, Map.Entry<String, Object> textSet, String key, XWPFParagraph paragraph, XWPFDocument document) throws org.apache.poi.openxml4j.exceptions.InvalidFormatException, IOException {
         if (textSet.getValue() instanceof WordParam) {
             setPicture(run, (WordParam) textSet.getValue());
         } else {
             String keyTemp = textSet.getKey();
             String keyValue = Objects.isNull(textSet.getValue()) ? "" : textSet.getValue().toString();
-            if (StringUtils.contains(keyValue, "%line-feed%")) {
-                
+
+            //琛ㄦ牸閲岀殑鎹㈣ 鐗规畩澶勭悊 鍥犱负娌℃湁娈佃惤
+            if(StringUtils.contains(keyValue, "%table-line-feed%")){
+                String[] keyValues = keyValue.split("%table-line-feed%");
+                runValue = delDynList(keyTemp, Arrays.asList(keyValues), paragraph, document,1);
+            }else if(StringUtils.contains(keyValue, "%line-feed%")){
                 String[] keyValues = keyValue.split("%line-feed%");
-                runValue = delDynList(keyTemp, Arrays.asList(keyValues), paragraph, document);
+                runValue = delDynList(keyTemp, Arrays.asList(keyValues), paragraph, document,0);
             }
+
             log.info("ChangeValue鐨刱ey鍊硷細" + key + "  ChangeValue鐨剉alue鍊硷細" + keyValue);
             runValue = runValue.replaceAll(key, keyValue);
         }
         return runValue;
     }
-    
+
     public AjaxResult exportBaseOrDetailReport(String fileName, List<String> deleteFileStrList, List<String> fileNameList) {
-        
+
         try {
             zipWord(fileName, fileNameList);
         } catch (FileNotFoundException e) {
@@ -721,19 +1143,19 @@
         } catch (Exception e) {
             e.printStackTrace();
         }
-        
+
         deleteFileByStr(deleteFileStrList);
         return AjaxResult.success(fileName + ".zip");
     }
     public AjaxResult exportZipKeepFiles(String fileName, List<String> deleteFileStrList, List<String> fileNameList) throws FileNotFoundException {
-        
+
         zipKeepWord(fileName, fileNameList);
-        
+
         deleteFileByStr(deleteFileStrList);
         return AjaxResult.success(fileName + ".zip");
     }
-    
-    
+
+
     public static String makeReportFile(String fileName, TReportTemplate tReportTemplate, Map<String, Object> textMap, Map<Integer, Map<Integer, List<String[]>>> autoTableMap, List<String> deleteFileStrList) {
         String returnMessage = "瀵煎嚭妯℃澘杞Щ閿欒:";
         InputStream in = null;
@@ -741,23 +1163,35 @@
         String zipFilePath = "";
         String reportName = "";
         try {
-            
+
             String reportType = tReportTemplate.getReportType();
             reportType = getTypeIfIsSAQ(tReportTemplate, reportType);
             reportType = getPositionIfJAQ(textMap, reportType);
             reportName = textMap.get("sendEmailFileName") + "_" + reportType + "_" + ReportTypeNameEnum.valueOf(tReportTemplate.getTemplateType()).getCode() + "_" + ReportTypeNameEnum.valueOf(tReportTemplate.getLangType()).getCode() + ".docx";
-            
             reportName = reportName.replaceAll(" ", "_");
+
+            //妯℃澘鏂囦欢闇�瑕佸姞閿�
             out = getDownLoadFileOutputStream(reportName);
-            
-            log.info("reportTemplate:" + fileName);
-            String templateType = tReportTemplate.getTemplateType();
-            setChageWord(fileName, out, textMap, tReportTemplate.getReportType(), templateType, autoTableMap);
-            out.flush();
-            changColorIfJAQ(textMap, out, reportName, tReportTemplate.getReportType());
-            ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
+            //synchronized (fileName.intern()){
+                //String templateType = tReportTemplate.getTemplateType();
+                setChageWord(fileName, out, textMap, tReportTemplate.getReportType(),tReportTemplate.getDataPath(), autoTableMap);
+                out.flush();
+                changColorIfJAQ(textMap, out, reportName, tReportTemplate.getReportType());
+            //}
+
+            //PAQ銆丮AQTR閲囩敤鏂扮殑doc杞琾df
+            if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)){
+                PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
+            }else{
+                ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
+                // ShellTool shellTool = ShellTool.builder();
+                // shellTool.execNewLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/" + reportName.replace("docx","pdf"));
+
+                //鏂版柟娉曟祴璇�
+                //LibreOfficeUtil.convertOffice2PDFSyncIsSuccess(new File(EssConfig.getProfile() + "/" + reportName),new File(EssConfig.getProfile() + "/" + reportName.replace("docx","pdf")));
+            }
             zipFilePath = getPdfPath(reportName);
-            
+
             deleteFileStrList.add(EssConfig.getProfile() + "/" + reportName);
         } catch (Exception ex) {
             returnMessage = returnMessage + ex.getMessage();
@@ -791,7 +1225,7 @@
         return reportName.substring(0, reportName.lastIndexOf(".")) + ".pdf";
     }
     public static void deleteFileByStr(List<String> deleteFileStrList) {
-        
+
         for (String deleteStr : deleteFileStrList) {
             File file = new File(deleteStr);
             file.delete();
@@ -825,7 +1259,7 @@
         }
         ZipUtil.toZip(fileList, zipOut);
     }
-    
+
     private static FileOutputStream getDownLoadFileOutputStream(String fileName) throws FileNotFoundException {
         File outFile = new File(EssConfig.getProfile() + "/" + fileName);
         if (!outFile.getParentFile().exists()) {
@@ -833,23 +1267,28 @@
         }
         return new FileOutputStream(outFile);
     }
-    private static void setChageWord(String fileName, OutputStream out, Map<String, Object> textMap, String reportType, String templateType, Map<Integer, Map<Integer, List<String[]>>> autoTableMap) throws IOException, org.apache.poi.openxml4j.exceptions.InvalidFormatException, DocumentException {
-        String filePath = getTemplateDownLoadPathByUpLoad(fileName);
-        
+
+    /**
+     * 鍐呭鍙樻洿
+     * @param fileName
+     * @param out
+     * @param textMap
+     * @param reportType
+     * @param autoTableMap
+     * @throws IOException
+     * @throws InvalidFormatException
+     * @throws DocumentException
+     */
+    private static void setChageWord(String fileName, OutputStream out, Map<String, Object> textMap, String reportType,String dataPath, Map<Integer, Map<Integer, List<String[]>>> autoTableMap) throws IOException, InvalidFormatException, DocumentException {
+        //String filePath = getTemplateDownLoadPathByUpLoad(fileName);
+
         XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(getTemplateDownLoadPathByUpLoad(fileName)));
 
         //璁剧疆鏂囨湰
         changeText(document, textMap);
 
-        //鏇存敼鏂囨湰妗�
-        if (Objects.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || Objects.equals(reportType, ReportTypeEnum.JAQ.getCode()) ) {
-            changeTextBox(document, textMap);
-        }
-
-        //CAQ鏇存敼鏂囨湰妗嗭紝wzp娴嬭瘯.2021.4.27
-/*        if (Objects.equals(reportType, ReportTypeEnum.CAQ.getCode())) {
-            changeTextBox(document, textMap);
-        }*/
+        //璁剧疆鏂囨湰妗�
+        changeTextBox(document, textMap);
 
         //鎻掑叆琛ㄦ牸
         addTableValue(document, autoTableMap);
@@ -858,12 +1297,12 @@
         changeTable(document, textMap);
 
         //璁剧疆鍥捐〃鎺т欢
-        changChar(textMap, document, reportType, templateType);
+        changChart(textMap, document, reportType,dataPath);
         document.write(out);
     }
     private static void changeTextBox(XWPFDocument document, Map<String, Object> textMap) throws DocumentException {
         List<XWPFParagraph> paragraphs = document.getParagraphs();
-        
+
         for (XWPFParagraph paragraph : paragraphs) {
             CTR[] rArray = paragraph.getCTP().getRArray();
             for (XmlObject ctr : rArray) {
@@ -886,16 +1325,17 @@
         }
     }
     private static String getValByKey(String text, Map<String, Object> textMap) {
+        log.debug("changeTextBox:{}",text);
         if (!checkText(text)) {
             return text;
         }
         String repText = "";
         Set<Map.Entry<String, Object>> textSets = textMap.entrySet();
         for (Map.Entry<String, Object> textSet : textSets) {
-            
+
             String key = "%" + textSet.getKey() + "%";
             if (text.indexOf(key) != -1) {
-                text = text.replaceAll(key, (String) textMap.get(textSet.getKey()));
+                text = text.replaceAll(key, String.valueOf(textMap.get(textSet.getKey())));
                 repText = text;
                 if (checkText(text)) {
                     continue;
@@ -917,7 +1357,7 @@
         if (StringUtils.isEmpty(fileName) || CollUtil.isEmpty(jaqTableStyleList)) {
             return;
         }
-        
+
         XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(EssConfig.getProfile() + "/" + fileName));
         if (Objects.isNull(document)) {
             return;
@@ -944,28 +1384,37 @@
 
     /**
      * 璁剧疆鍥炬爣鎺т欢
-     * @param textMap
-     * @param document
-     * @param reportType
-     * @param templateType
+     * @param textMap 鏇挎崲text
+     * @param document 鎶ュ憡鏂囦欢
+     * @param reportType 鎶ュ憡绫诲瀷
+     * @param dataPath MAQTR鏁版嵁璺緞
      */
-    private static void changChar(Map<String, Object> textMap, XWPFDocument document, String reportType, String templateType) {
-        if (StringUtils.isEmpty(reportType) || StringUtils.isEmpty(templateType)) {
+    private static void changChart(Map<String, Object> textMap, XWPFDocument document, String reportType,String dataPath) {
+        if (StringUtils.isEmpty(reportType)) {
             return;
         }
         List<XWPFChart> charts = document.getCharts();
         if (ExamUtil.isListEmpty(charts)) {
             return;
         }
-        if (StringUtils.equals(reportType, ReportTypeEnum.MAQ.getCode())) {
-            setMAQCompleteChars(textMap, charts);
-        } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode())) {
-            setMAQ_V2CompleteChars(textMap, charts);
-        } else if (StringUtils.equals(reportType, ReportTypeEnum.RuiLin.getCode())) {
-            setRuiLinChar(textMap, charts);
-        } else {
-            return;
+        try{
+            if (StringUtils.equals(reportType, ReportTypeEnum.MAQ.getCode())) {
+                setMAQCompleteChars(textMap, charts);
+            } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQV2.getCode()) || StringUtils.equals(reportType, ReportTypeEnum.MAQIAR.getCode())) {
+                setMAQ_V2CompleteChars(textMap, charts);
+            } else if (StringUtils.equals(reportType, ReportTypeEnum.RuiLin.getCode())) {
+                setRuiLinChar(textMap, charts);
+            } else if (StringUtils.equals(reportType, ReportTypeEnum.PAQ.getCode())) {
+                PAQChart.changeChart(document, textMap);
+            } else if (StringUtils.equals(reportType, ReportTypeEnum.MAQTR.getCode())) {
+                MAQTRChart.changeMAQTRChart(document, dataPath);
+            } else {
+                return;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
         }
+
     }
     private static void setMAQ_V2CompleteChars(Map<String, Object> textMap, List<XWPFChart> charts) {
         String p_Task31 = textMap.get("P_Task31").toString();
@@ -973,7 +1422,7 @@
         String P_INCON25 = textMap.get("P_INCON25").toString();
         String P_IM24 = textMap.get("P_IM24").toString();
         String P_SDE23 = textMap.get("P_SDE23").toString();
-        
+
         for (XWPFChart xwpfChart : charts) {
             try {
                 CTChart ctChart = xwpfChart.getCTChart();
@@ -1020,15 +1469,15 @@
             setCharMap.put(12, WordUtil::set12RuilinChartList);
             setCharMap.put(38, WordUtil::set38RuilinChartList);
             setCharMap.put(4, WordUtil::set4RuilinChartList);
-            
+
             XWPFChart xwpfChart0 = charts.get(0);
             List<CTNumVal> ptList = xwpfChart0.getCTChart().getPlotArea().getBarChartList().get(0).getSerList().get(0).getVal().getNumRef().getNumCache().getPtList();
             setCharMap.get(char0Size).setsetRuilinChartList(textMap, ptList);
-            
+
             XWPFChart xwpfChart1 = charts.get(1);
             ptList = xwpfChart1.getCTChart().getPlotArea().getBarChartList().get(0).getSerList().get(0).getVal().getNumRef().getNumCache().getPtList();
             setCharMap.get(char1Size).setsetRuilinChartList(textMap, ptList);
-            
+
 
 
 
@@ -1099,13 +1548,13 @@
     private static void setMAQCompleteChars(Map<String, Object> textMap, List<XWPFChart> charts) {
         String p_Task31 = textMap.get("P_Task31").toString();
         String p_People32 = textMap.get("P_People32").toString();
-        
+
         XWPFChart xwpfChart = charts.get(0);
         if (!setMAQbarGraph(p_Task31, p_People32, xwpfChart)) {
             log.info("绗簩涓槸鏉″舰");
             setMAQcanvasChart(p_Task31, p_People32, xwpfChart);
         }
-        
+
         XWPFChart xwpfChartLeadershipFourSided = charts.get(1);
         if (!setMAQcanvasChart(p_Task31, p_People32, xwpfChartLeadershipFourSided)) {
             log.info("绗竴涓槸鐢诲竷");
@@ -1146,18 +1595,18 @@
         }
         return true;
     }
-    
+
     private String getTemplateDownLoadPath(String fileName) {
-        
+
         return EssConfig.getReportTemplates() + fileName;
     }
-    
+
     private static String getTemplateDownLoadPathByUpLoad(String fileName) {
         return EssConfig.getUploadPath() + fileName;
     }
-    
+
     public static String getTemplatePicture(String pictureName) {
-        
+
         return EssConfig.getReportTemplates() + pictureName;
     }
     private static void closeChannel(InputStream inputStream) {
@@ -1179,34 +1628,44 @@
         }
     }
     public File getAbsoluteFileZipByName(String filename) {
-        String downloadPath = EssConfig.getDownloadPath() + filename;
+        String downloadPath = EssConfig.getDownloadPath() + "/" + filename;
         File desc = new File(downloadPath);
         if (!desc.getParentFile().exists()) {
             desc.getParentFile().mkdirs();
         }
         return desc;
     }
-    
+
     public static void insertNextPageChar(XWPFDocument document) {
         XWPFParagraph paragraph = document.createParagraph();
-        
+
         CTPPr ctpPr = paragraph.getCTP().addNewPPr();
-        
+
         ctpPr.addNewSectPr();
     }
-    private static String delDynList(String placeholder, List obj, XWPFParagraph oldParagraph, XWPFDocument templateDoc) {
+
+    private static String delDynList(String placeholder, List obj, XWPFParagraph oldParagraph, XWPFDocument templateDoc,Integer flag) {
         String placeholderValue = placeholder;
         List dataList = obj;
-        Collections.reverse(dataList);
+        //鏅�氭崲琛岄檷搴忓鐞�  琛ㄦ牸鎹㈣鏃犻渶闄嶅簭
+        if(flag == 0){
+            Collections.reverse(dataList);
+        }
         XWPFRun oldRun = oldParagraph.getRuns().size() > 0 ? oldParagraph.getRuns().get(0) : null;
         Boolean isBold = Objects.nonNull(oldRun) ? oldRun.isBold() : false;
         for (int i = 0, size = dataList.size(); i < size; i++) {
             Object text = dataList.get(i);
-            
+
             if (i == 0) {
                 placeholderValue = String.valueOf(text);
             } else {
-                XWPFParagraph paragraph = createParagraph(oldParagraph, templateDoc, oldRun, isBold, String.valueOf(text));
+                XWPFParagraph paragraph = null;
+                if(flag == 0){
+                    paragraph = createParagraph(oldParagraph, templateDoc, oldRun, isBold, String.valueOf(text));
+                }else if(flag == 1){
+                    paragraph = createTableRun(oldParagraph, oldRun, isBold, String.valueOf(text));
+                }
+
                 if (paragraph != null) {
                     oldParagraph = paragraph;
                 }
@@ -1214,32 +1673,55 @@
         }
         return placeholderValue;
     }
-    
+
     public static XWPFParagraph createParagraph(XWPFParagraph oldParagraph, XWPFDocument templateDoc, XWPFRun oldRun, boolean isBold, String... texts) {
-        
+
         XmlCursor cursor = oldParagraph.getCTP().newCursor();
         XWPFParagraph newPar = templateDoc.insertNewParagraph(cursor);
-        
+
         newPar.getCTP().setPPr(oldParagraph.getCTP().getPPr());
         copyParagraph(oldParagraph, newPar, oldRun, isBold, texts);
         return newPar;
     }
-    
-    ;
+
+    /**
+     * 鍒涘缓table琛ㄦ牸鎹㈣ 娈佃惤run
+     * @param oldParagraph
+     * @param oldRun
+     * @param isBold
+     * @param texts
+     * @return
+     */
+    public static XWPFParagraph createTableRun(XWPFParagraph oldParagraph,XWPFRun oldRun, boolean isBold, String... texts) {
+
+        XWPFRun run = oldParagraph.createRun();
+        run.addBreak();
+        run.setText(texts[0]);
+        run.setFontFamily(oldRun.getFontFamily());
+        int fontSize = oldRun.getFontSize();
+        run.setFontSize((fontSize == -1) ? DEFAULT_FONT_SIZE : fontSize);
+        run.setBold(isBold);
+        run.setItalic(oldRun.isItalic());
+        run.setColor(oldRun.getColor());
+
+        return null;
+    }
+
+
     private static void copyParagraph(XWPFParagraph sourcePar, XWPFParagraph targetPar, XWPFRun oldRun, boolean isBold, String... texts) {
         targetPar.setAlignment(sourcePar.getAlignment());
         targetPar.setVerticalAlignment(sourcePar.getVerticalAlignment());
-        
+
         targetPar.setAlignment(sourcePar.getAlignment());
         targetPar.setVerticalAlignment(sourcePar.getVerticalAlignment());
         if (texts != null && texts.length > 0) {
             String[] arr = texts;
-            
+
             for (int i = 0, len = texts.length; i < len; i++) {
                 String text = arr[i];
                 XWPFRun run = targetPar.createRun();
                 run.setText(text);
-                
+
                 run.setFontFamily(oldRun.getFontFamily());
                 int fontSize = oldRun.getFontSize();
                 run.setFontSize((fontSize == -1) ? DEFAULT_FONT_SIZE : fontSize);
@@ -1259,12 +1741,12 @@
         jaqTableStyle.setTableNum(tableNum);
         Map<Integer, String> rowColorMap = new HashMap<>();
         jaqTableStyle.setRowColorMap(rowColorMap);
-        
+
         for (Integer i = 1; i <= inum; i++) {
             if (Objects.equals(textMap.get(line + i.toString() + "C"), "1")) {
                 rowColorMap.put(i, "C00000");
             }
-            
+
 
         }
         if (CollUtil.isNotEmpty(rowColorMap)) {
@@ -1278,4 +1760,51 @@
             textMap.put("JAQTableStyle", jaqTableStyleList);
         }
     }
+
+    public static int getTextSize(String runValue){
+        Pattern pattern = Pattern.compile("%\\w+%");
+        Matcher matcher = pattern.matcher(runValue);
+        List<String> result = new ArrayList<>();
+        while(matcher.find()){
+            result.add(matcher.group());
+        }
+        return result.size();
+    }
+
+
+    public static void main(String[] args) {
+/*        if (!checkText("浜烘墠閫夋嫈鐨勭洰鐨勫氨鏄壘鍒拌兘澶熻儨浠诲伐浣溿�佹効鎰忔壙鎷呭伐浣滐紝涓斾笌缁勭粐鐨勯渶姹傘�佹枃鍖栥�佷环鍊艰鐩稿尮閰嶇殑浜恒�侾AQ鎶ュ憡鏄牴鎹�欓�変汉瀵筆AQ闂嵎涓鐩殑浣滅瓟淇℃伅鑰岀敓鎴愮殑锛屾祴閲忕殑鏄�欓�変汉鍦ㄥ伐浣滀腑鍋忓ソ鐨勮涓洪鏍笺�侾AQ涔熷寘鎷簡瀵逛綔绛旂湡瀹炴�х殑娴嬮噺锛屽悓鏃朵篃瑁呭叆浜員AI涓撴湁鐨勪綔鍋囬槻鑼冪▼搴忥紝鍙互鏈夋晥闄嶄綆鍊欓�変汉鐨勪吉瑁呭ソ鍊惧悜锛堝叏鐞�30%鐨勮嚜璇勯棶鍗蜂腑閮藉嚭鐜颁簡浼濂界幇璞★級銆�")) {
+            System.out.println("11");
+        }*/
+
+        try {
+            InputStream is = new FileInputStream("C:\\Users\\Administrator\\Desktop\\JAQ涓枃鐗�.docx");
+            XWPFDocument document = new XWPFDocument(is);
+
+            String result = "{\"T3Line21C\":\"0\",\"T4com8item1\":\"JAQ0117\",\"T1com8IF_H\":\"9.00\",\"T4com8item2\":\"JAQ0073\",\"T1com8IF_L\":\"6.76\",\"T1com8IF_M\":\"7.88\",\"T3item2\":\"JAQ0009\",\"T2com1I_L\":\"3.00\",\"T3item3\":\"JAQ0015\",\"T3item4\":\"JAQ0022\",\"T3item5\":\"JAQ0035\",\"T3item6\":\"JAQ0051\",\"T3item7\":\"JAQ0117\",\"T3item8\":\"JAQ0120\",\"T3item9\":\"JAQ0127\",\"T2com1I_H\":\"3.20\",\"T3item3IF_M\":\"12.50\",\"T3Line10C\":\"0\",\"T3Line22C\":\"0\",\"T3Line9C\":\"0\",\"T1com1IF_M\":\"9.62\",\"T1com1IF_L\":\"9.00\",\"T2com6I_L\":\"2.60\",\"T1com1IF_H\":\"10.24\",\"T4com11item2\":\"JAQ0008\",\"T1com4IF_M\":\"8.20\",\"T1com4IF_L\":\"4.84\",\"T3Line11C\":\"1\",\"T4com11item1\":\"JAQ0093\",\"T2com6I_H\":\"3.00\",\"T1com4IF_H\":\"11.56\",\"T3item16IF_M\":\"9.00\",\"T3com18\":\"24\",\"T4com6item1\":\"JAQ0038\",\"T3com17\":\"5\",\"T3com19\":\"15\",\"T4com6item2\":\"JAQ0100\",\"T3Line8C\":\"0\",\"T3com10\":\"13\",\"T3item13IF_M\":\"9.00\",\"T3com12\":\"13\",\"T3com11\":\"21\",\"T3com14\":\"26\",\"T3Line23C\":\"0\",\"T3com13\":\"10\",\"T3com16\":\"5\",\"T3com15\":\"1\",\"T1com11IF_L\":\"4.84\",\"T1com11IF_M\":\"7.54\",\"T1com11IF_H\":\"10.24\",\"T2com1\":\"18\",\"T2com2\":\"4\",\"T3Line6C\":\"0\",\"T2com9\":\"22\",\"T2com7\":\"17\",\"T2com8\":\"19\",\"T2com5\":\"9\",\"T3item7IF_M\":\"12.50\",\"T3Line7C\":\"0\",\"T2com6\":\"15\",\"T3item24IF_M\":\"9.00\",\"T2com3\":\"27\",\"T2Com5I_M\":\"2.80\",\"T2com4\":\"8\",\"T3Line12C\":\"0\",\"T3Line24C\":\"1\",\"T1com4\":\"8\",\"T4com2item2\":\"JAQ0034\",\"T1com5\":\"19\",\"T1com6\":\"9\",\"T1com7\":\"15\",\"T4com2item1\":\"JAQ0120\",\"T1com8\":\"17\",\"T1com9\":\"22\",\"T2Com6I_M\":\"2.80\",\"T1com1\":\"18\",\"T1com2\":\"4\",\"T1com3\":\"27\",\"T2Line9C\":\"0\",\"T1com7IF_H\":\"9.00\",\"T2com5I_H\":\"3.00\",\"T1com7IF_M\":\"7.88\",\"T3Line13C\":\"1\",\"T1com7IF_L\":\"6.76\",\"T3Line25C\":\"0\",\"T2com5I_L\":\"2.60\",\"T1com2IF_M\":\"8.42\",\"T1com2IF_L\":\"7.84\",\"T1com2IF_H\":\"9.00\",\"T4com12item2\":\"JAQ0135\",\"T4com12item1\":\"JAQ0134\",\"琛�4瀛愰泦鍚圽":\"2\",\"T2rank1\":\"1\",\"T3item4IF_M\":\"12.50\",\"T2rank3\":\"3\",\"T3com21\":\"18\",\"T2rank2\":\"2\",\"T3com20\":\"18\",\"T2rank5\":\"5\",\"T3com23\":\"1\",\"T2rank4\":\"4\",\"T3com22\":\"10\",\"T2rank7\":\"7\",\"T3com25\":\"9\",\"T2rank6\":\"6\",\"T3com24\":\"14\",\"T2rank9\":\"9\",\"T3Line14C\":\"0\",\"T2rank8\":\"8\",\"T3item23IF_M\":\"9.00\",\"T3item25\":\"JAQ0038\",\"T3item24\":\"JAQ0037\",\"T3item23\":\"JAQ0021\",\"T1rank9\":\"9\",\"T3item22\":\"JAQ0026\",\"T3item21\":\"JAQ0017\",\"T3item20\":\"JAQ0012\",\"T1rank6\":\"6\",\"T1com3IF_M\":\"8.42\",\"T1rank5\":\"5\",\"T1com3IF_L\":\"7.84\",\"T1rank8\":\"8\",\"T1rank7\":\"7\",\"T1rank2\":\"2\",\"T1rank1\":\"1\",\"T1rank4\":\"4\",\"T1rank3\":\"3\",\"琛�1\":\"12\",\"琛�2\":\"12\",\"琛�3\":\"25\",\"琛�4\":\"12\",\"T1com3IF_H\":\"9.00\",\"T3Line15C\":\"0\",\"T3item8IF_M\":\"12.50\",\"T3item17IF_M\":\"9.00\",\"T3item19\":\"JAQ0131\",\"T3item18\":\"JAQ0014\",\"T4com7item1\":\"JAQ0131\",\"T3item12IF_M\":\"9.00\",\"T3item17\":\"JAQ0135\",\"T4com7item2\":\"JAQ0066\",\"T3item16\":\"JAQ0134\",\"T3item15\":\"JAQ0013\",\"T1com12IF_M\":\"7.38\",\"T3item14\":\"JAQ0090\",\"T3item13\":\"JAQ0096\",\"T3item12\":\"JAQ0008\",\"T4com12\":\"5\",\"T3item11\":\"JAQ0110\",\"T3item10\":\"JAQ0093\",\"T4com10\":\"26\",\"T3item1\":\"JAQ0003\",\"T4com11\":\"13\",\"T1com12IF_H\":\"9.00\",\"T1com12IF_L\":\"5.76\",\"T2Com10I_M\":\"2.80\",\"T2com10I_H\":\"3.00\",\"T3Line16C\":\"0\",\"T2Com1I_M\":\"3.10\",\"T2com4I_H\":\"3.40\",\"T2com10I_L\":\"2.60\",\"T4com1item2\":\"JAQ0012\",\"T2com4I_L\":\"2.20\",\"T4com1item1\":\"JAQ0022\",\"T2Line4C\":\"0\",\"T3item5IF_M\":\"12.50\",\"T2com11I_H\":\"2.80\",\"T3Line1C\":\"0\",\"T4rank10\":\"10\",\"T4rank12\":\"12\",\"T4rank11\":\"11\",\"T3Line17C\":\"0\",\"T2Com2I_M\":\"2.90\",\"T2com11I_L\":\"2.60\",\"T2com9I_L\":\"2.60\",\"T4com9item1\":\"JAQ0035\",\"T4com9item2\":\"JAQ0083\",\"T2com9I_H\":\"3.00\",\"T2Line5C\":\"0\",\"T2Com7I_M\":\"2.80\",\"T2Line6C\":\"0\",\"T3Line18C\":\"1\",\"T2com12\":\"5\",\"T2Line11C\":\"1\",\"T2com10\":\"26\",\"T2com11\":\"1\",\"T4com5item1\":\"JAQ0127\",\"T4com5item2\":\"JAQ0046\",\"T4com3\":\"27\",\"T4com4\":\"8\",\"T4com1\":\"18\",\"T3item9IF_M\":\"10.00\",\"T3item22IF_M\":\"9.00\",\"T4com2\":\"4\",\"T4com7\":\"15\",\"T3item2IF_M\":\"12.50\",\"T4com8\":\"17\",\"T4com5\":\"19\",\"T2Com8I_M\":\"2.80\",\"T2Com11I_M\":\"2.70\",\"T4com6\":\"9\",\"T2com3I_H\":\"3.00\",\"T3rank22\":\"22\",\"T3rank21\":\"21\",\"T3rank20\":\"20\",\"T4com9\":\"22\",\"T2Line7C\":\"0\",\"T3Line19C\":\"0\",\"T2com3I_L\":\"2.80\",\"T3rank25\":\"25\",\"T3rank24\":\"24\",\"T3rank23\":\"23\",\"T2Line10C\":\"0\",\"T1com6IF_M\":\"7.88\",\"T1com6IF_L\":\"6.76\",\"T3item18IF_M\":\"9.00\",\"T1com6IF_H\":\"9.00\",\"T3item11IF_M\":\"10.00\",\"T2Line8C\":\"0\",\"T2com8I_L\":\"2.40\",\"T1com9IF_M\":\"7.88\",\"T3rank1\":\"1\",\"T2com8I_H\":\"3.20\",\"T3rank2\":\"2\",\"T3item10IF_M\":\"10.00\",\"T3rank9\":\"9\",\"T3Line5C\":\"0\",\"T3rank7\":\"7\",\"T3rank8\":\"8\",\"T3rank5\":\"5\",\"T3rank6\":\"6\",\"T3rank3\":\"3\",\"T3rank4\":\"4\",\"T4rank7\":\"7\",\"T4rank6\":\"6\",\"T4rank5\":\"5\",\"T4rank4\":\"4\",\"T4com3item2\":\"JAQ0055\",\"T4rank9\":\"9\",\"T4com3item1\":\"JAQ0051\",\"T4rank8\":\"8\",\"T3item6IF_M\":\"12.50\",\"T4rank3\":\"3\",\"T4rank2\":\"2\",\"T4rank1\":\"1\",\"T3rank19\":\"19\",\"T2Line1C\":\"0\",\"T3rank18\":\"18\",\"T2Line12C\":\"0\",\"T3rank17\":\"17\",\"T3rank16\":\"16\",\"T2com12I_H\":\"3.00\",\"T3Line4C\":\"0\",\"T3item20IF_M\":\"9.00\",\"T2Com12I_M\":\"2.70\",\"T2Com3I_M\":\"2.90\",\"T3item14IF_M\":\"9.00\",\"T3rank11\":\"11\",\"T3rank10\":\"10\",\"T2com2I_H\":\"3.00\",\"T1com9IF_H\":\"9.00\",\"T2com12I_L\":\"2.40\",\"T3rank15\":\"15\",\"T3rank14\":\"14\",\"T2com2I_L\":\"2.80\",\"T3rank13\":\"13\",\"T1com9IF_L\":\"6.76\",\"T3rank12\":\"12\",\"T2rank10\":\"10\",\"T3item15IF_M\":\"9.00\",\"T2Line2C\":\"0\",\"T2rank12\":\"12\",\"T2rank11\":\"11\",\"T3Line3C\":\"1\",\"T1com10IF_M\":\"7.88\",\"T1com10IF_L\":\"6.76\",\"T2Com4I_M\":\"2.80\",\"T4com10item2\":\"JAQ0040\",\"T1com10IF_H\":\"9.00\",\"T4com10item1\":\"JAQ0090\",\"T3item25IF_M\":\"9.00\",\"T3item1IF_M\":\"14.50\",\"T3item21IF_M\":\"9.00\",\"T2com7I_L\":\"2.60\",\"T3com6\":\"27\",\"T3com7\":\"17\",\"T3Line20C\":\"0\",\"T2com7I_H\":\"3.00\",\"T3com8\":\"4\",\"T3com9\":\"19\",\"T3com2\":\"25\",\"T3com3\":\"23\",\"T3com4\":\"18\",\"T2Line3C\":\"0\",\"T3com5\":\"22\",\"T1rank12\":\"12\",\"T1rank11\":\"11\",\"T1rank10\":\"10\",\"T3Line2C\":\"1\",\"T1com5IF_H\":\"10.24\",\"T1com10\":\"26\",\"T1com11\":\"13\",\"T2Com9I_M\":\"2.80\",\"T1com12\":\"5\",\"T3item19IF_M\":\"9.00\",\"T1com5IF_M\":\"8.00\",\"T3com1\":\"8\",\"T4com4item1\":\"JAQ0003\",\"T1com5IF_L\":\"5.76\",\"T4com4item2\":\"JAQ0042\"}";
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            //json瀵硅薄杞琈ap
+            Map<String,Object> textMap = jsonObject;
+
+            //鏇存敼琛ㄦ牸鐨勫��
+            textMap.put("sendEmailFileName", "JAQ");
+            textMap.put("SelectUsers",8);
+            //changeTable(document, textMap);
+
+
+            changeText(document, textMap);
+            changeTextBox(document, textMap);
+            addTableValue(document, null);
+            changeTable(document, textMap);
+            //changChart(textMap, document, reportType, dataPath);
+
+            //寤虹珛鏂囦欢瀵硅薄
+            File file = new File("C:\\Users\\Administrator\\Desktop\\JAQ涓枃鐗�1.docx");
+            FileOutputStream out = new FileOutputStream(file);
+            document.write(out);
+            out.flush();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

--
Gitblit v1.9.1