From 7d03d9fe3714a10fdd51f24e3c84da31a36f4ad8 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 15 七月 2025 14:28:14 +0800
Subject: [PATCH] fix:修复docker转化pdf文件卡顿和IO暴涨问题。 用单例控制docker转化,并监控docker状态

---
 src/main/java/com/ots/common/utils/poi/WordUtil.java |  760 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 581 insertions(+), 179 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 3ab498f..44f60fa 100644
--- a/src/main/java/com/ots/common/utils/poi/WordUtil.java
+++ b/src/main/java/com/ots/common/utils/poi/WordUtil.java
@@ -12,15 +12,26 @@
 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.PdfDockerUtil;
 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.JsonUtil;
 import com.ots.project.tool.exam.ZipUtil;
+import com.ots.project.tool.libreoffice.LibreOfficeUtil;
+import com.ots.project.tool.report.APIFan.chart.APIFanChart;
+import com.ots.project.tool.report.CIAQ.chart.CIAQChart;
+import com.ots.project.tool.report.JAQ.condition.JAQTeam;
+import com.ots.project.tool.report.LAQ.chart.LAQAllChart;
+import com.ots.project.tool.report.LAQ.chart.LAQAllPng;
+import com.ots.project.tool.report.LAQ.chart.LAQChart;
+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;
+import org.apache.poi.openxml4j.util.ZipSecureFile;
 import org.apache.poi.util.Units;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;
@@ -36,9 +47,15 @@
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import springfox.documentation.spring.web.json.Json;
+
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.time.LocalDate;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -53,18 +70,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);
@@ -78,15 +95,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) {
@@ -98,14 +115,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);
@@ -117,12 +134,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) {
@@ -131,10 +148,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) {
@@ -142,19 +159,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();
@@ -198,15 +215,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);
                     }
@@ -216,15 +233,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();
@@ -235,7 +252,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());
@@ -243,10 +260,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());
@@ -254,7 +271,7 @@
             drawing.removeInline(0);
         }
     }
-    
+
     public static CTAnchor getAnchorWithGraphic(CTGraphicalObject ctGraphicalObject,
                                                 String deskFileName, int width, int height,
                                                 int leftOffset, int topOffset, boolean behind, int topPosition) {
@@ -284,9 +301,9 @@
         anchor.setGraphic(ctGraphicalObject);
         return anchor;
     }
-    
+
     public static void changeTable(XWPFDocument document, Map<String, Object> textMap) {
-        
+
         List<XWPFTable> tables = document.getTables();
         setTableValue(document, textMap, tables);
     }
@@ -299,7 +316,7 @@
      */
     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);
@@ -307,10 +324,13 @@
                     log.info("琛ㄨ鏁�:{}",table.getRows().size());
                     log.info("琛ㄦ牸鏁版嵁锛�" + table.getText());
                     //澧炲姞琛ㄦ牸鎴栬�呮笡灏戣〃鏍�
-                    addOrDelTableRow(table,i,textMap);
+                    if (Objects.equals(textMap.get("sendEmailFileName"), ReportTypeEnum.JAQ.getCode())) {
+                        log.info("琛細{}",i);
+                        addOrDelTableRow(table,i,textMap);
+                    }
                     if (checkText(table.getText())) {
                         List<XWPFTableRow> rows = table.getRows();
-                        
+
                         eachTable(rows, textMap, document);
                     }
                 }
@@ -333,13 +353,15 @@
             Integer tableNum = Integer.valueOf(textMap.get(tableEnum.getName()).toString());
             Integer rows = table.getRows().size();
 
+            log.info("[娴嬭瘯]-tableEnum锛�"+tableEnum.toString());
+
             //琛�1-琛�3 闇�鍓旈櫎琛ㄥご
             Integer contentRows = rows - 1;
             //琛�4 闇�鍓旈櫎琛ㄥご璺熷熬閮ㄩ鐣欒鏁�
             if(tableEnum == TableEnum.table4){
-                contentRows -= 5;
-                rows -= 5;
-
+                //濡傛灉琛�4锛岃澧炲姞鏄剧ず琛岋紝杩欓噷瑕佹敼鍔�
+                contentRows -= 3;
+                rows -= 3;
 
                 //琛�4 琛屼负琛ㄧ幇涓句緥澶勭悊
                 Integer table4ChildrenNum = Integer.valueOf(textMap.get(TableEnum.table4Children.getName()).toString());
@@ -379,39 +401,77 @@
                         }
                     }
                 }
-                //琛�4 鑳滀换鍔涢鐣欎綅缃簭鍙峰鐞�
-                if(tableNum != null && tableNum != 8){
-                    for (int i = tableNum; i < tableNum+4; i++) {
-                        XWPFTableRow row = table.getRows().get(i);
+            }
+
+            //table5涓嶉渶瑕佽拷鍔狅紝鍗曠嫭澶勭悊
+            if(tableEnum != TableEnum.table5) {
+                //闄愬埗琛屾暟涓嶄负绌� 鍜� 闄愬埗琛屾暟璺熸姤鍛婄幇鏈変笉涓�鑷撮渶杩涜澶勭悊
+                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锛岃澧炲姞鏄剧ず琛岋紝杩欓噷瑕佹敼鍔�
+            //琛�4 鑳滀换鍔涢鐣欎綅缃簭鍙峰鐞�
+            if(tableEnum == TableEnum.table4){
+                if(tableNum != null && tableNum != 12){
+                    for (int i = tableNum; i <= tableNum + 2; 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)+".");
                     }
                 }
             }
 
-            //闄愬埗琛屾暟涓嶄负绌� 鍜� 闄愬埗琛屾暟璺熸姤鍛婄幇鏈変笉涓�鑷撮渶杩涜澶勭悊
-            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);
+
+            //琛�6锛屾樉绀篔AQ鎶ュ憡鍙備笌浜�
+            if(tableEnum == TableEnum.table5)
+            {
+                log.info("銆愯〃5銆戝紑濮嬪鐞�...{}",tableNum);
+//                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);
+//                        }
+//                    }
+//                }
+                if(tableNum>0)
+                {
+                    for(int i=rows;i<rows+tableNum;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);
+                    delJAQTable(table,1);
                 }
+                log.info("銆愯〃5銆戝鐞嗗畬鎴�...");
             }
 
         }catch (Exception e){
             e.printStackTrace();
             log.info("琛▄}澧炲姞琛ㄦ牸鎴栬�呮笡灏戣〃鏍煎紓甯�",index+1);
+            log.info("寮傚父锛歿}",e.getMessage());
         }
     }
 
@@ -463,6 +523,7 @@
 
         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)+"");
@@ -533,6 +594,48 @@
                         cell.getParagraphs().get(cell.getParagraphs().size()-1).getRuns().get(0).setText(null);
                     }
                 }
+                break;
+            case table5:
+                log.info("[add] table5,澧炲姞琛屻�俰ndex={}",index);
+                String teamUsers = textMap.get("teamUserList").toString();
+                List<JAQTeam> teamUserList = JsonUtil.toJsonListObject(teamUsers,JAQTeam.class);
+
+                int keyIndex = index-2;
+                if(keyIndex>=0)
+                {
+                    log.info("褰撳墠keyIndex:{}",keyIndex);
+                    for(int k =0;k<3;k++)
+                    {
+                        XWPFParagraph p =cells.get(k).getParagraphs().get(0);
+                        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);
+
+                        switch (k){
+                            case 0:run.setText(String.valueOf(keyIndex+1),0); break;
+                            case 1:run.setText(teamUserList.get(keyIndex).getTeamName(),0);break;
+                            case 2:run.setText(teamUserList.get(keyIndex).getTeamDepart(),0);break;
+                            case 3:run.setText(teamUserList.get(keyIndex).getTeamName(),0);break;
+                            default:break;
+                        }
+                    }
+                }
+
+
+
+
+
+//                cells.get(0).getParagraphs().get(0).getRuns().get(0).setText(index.toString());
+//                cells.get(1).getParagraphs().get(0).getRuns().get(0).setText(teamUserList.get(index).getTeamName());
+//                cells.get(2).getParagraphs().get(0).getRuns().get(0).setText(teamUserList.get(index).getTeamDepart());
+//                cells.get(3).getParagraphs().get(0).getRuns().get(0).setText(teamUserList.get(index).getTeamName());
                 break;
         }
     }
@@ -733,14 +836,14 @@
         }
         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);
@@ -783,12 +886,12 @@
         }
         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();
@@ -815,17 +918,16 @@
         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);
@@ -834,7 +936,7 @@
                 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) {
                 }
@@ -866,12 +968,12 @@
         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 = "";
@@ -893,20 +995,19 @@
                 }
             }
         }
-        
+
         if (checkText(runValue)) {
             runValue = runValue.replaceAll("%.*%", "");
-            runValue = runValue.replaceAll("N/A NONE", "");
-            
         }
-        
+        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();
@@ -932,12 +1033,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();
@@ -965,7 +1066,7 @@
                 pointer = end;
             }
         }
-        
+
         paragraph.removeRun(runPosition);
         return "NoChangValue";
     }
@@ -1037,7 +1138,7 @@
 
 
     private static void changOtherPicture(XWPFParagraph paragraph) {
-        
+
         String paragraphText = paragraph.getText();
         if (paragraphText.indexOf("{start.png}") == -1) {
             return;
@@ -1053,22 +1154,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;
             }
@@ -1104,26 +1205,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) {
@@ -1131,19 +1237,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;
@@ -1151,28 +1257,56 @@
         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.replace("\t","");
             reportName = reportName.replaceAll(" ", "_");
+
+            //妯℃澘鏂囦欢闇�瑕佸姞閿�
             out = getDownLoadFileOutputStream(reportName);
-            
-            log.info("reportTemplate:" + fileName);
-            String templateType = tReportTemplate.getTemplateType();
-            setChageWord(fileName, out, textMap, tReportTemplate.getReportType(), templateType, autoTableMap);
+            //synchronized (fileName.intern()){
+                //String templateType = tReportTemplate.getTemplateType();
+            long startTime1 = System.currentTimeMillis();
+            setChageWord(fileName, out, textMap, tReportTemplate.getReportType(), tReportTemplate.getDataPath(), autoTableMap);
+            // 鑾峰彇缁撴潫鏃堕棿
+            long endTime1 = System.currentTimeMillis();
+            // 璁$畻鑰楁椂锛堝崟浣嶏細姣锛�
+            long duration1 = endTime1 - startTime1;
+            log.info("setChageWord 绋嬪簭鎵ц鑰楁椂锛�" + duration1 + " 姣锛岀敓鎴愭姤鍛婏細"+reportName);
+
             out.flush();
             changColorIfJAQ(textMap, out, reportName, tReportTemplate.getReportType());
-            //PAQ閲囩敤鏂扮殑doc杞琾df
-            if(!ReportTypeEnum.PAQ.getCode().equals(reportType)){
-                ShellTool.execLibreofficeCommand("pdf", EssConfig.getProfile() + "/" + reportName, EssConfig.getProfile() + "/");
-            }else{
+            //}
+
+            //PAQ銆丮AQTR閲囩敤銆丆IAQ銆丄PIFan鏂扮殑doc杞琾df
+            if(ReportTypeEnum.PAQ.getCode().equals(reportType) || ReportTypeEnum.MAQTR.getCode().equals(reportType)
+                    || ReportTypeEnum.CIAQ.getCode().equals(reportType) ||ReportTypeEnum.API_Fan.getCode().equals(reportType)){
                 PdfUtil.convertPDF(EssConfig.getProfile() + "/" + reportName);
+            }else if(ReportTypeEnum.LAQ.getCode().equals(reportType)){
+                // 鑾峰彇寮�濮嬫椂闂�
+                long startTime = System.currentTimeMillis();
+//                PdfUtil.dockerConvertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
+                PdfDockerUtil.convertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
+
+                // 鑾峰彇缁撴潫鏃堕棿
+                long endTime = System.currentTimeMillis();
+                // 璁$畻鑰楁椂锛堝崟浣嶏細姣锛�
+                long duration = endTime - startTime;
+                log.info("dockerConvertPDF 绋嬪簭鎵ц鑰楁椂锛�" + duration + " 姣锛岀敓鎴愭姤鍛婏細"+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();
@@ -1184,6 +1318,128 @@
         }
         return zipFilePath;
     }
+
+
+    /**
+     * LAQ浣跨敤-----澶參浜嗐�傚お鎱簡
+     * @param fileName
+     * @param tReportTemplate
+     * @param textMap
+     * @param autoTableMap
+     * @param deleteFileStrList
+     * @return
+     */
+    private static List<String> reportNameList = new ArrayList<>();
+//    public static String makeReportFileForLAQ(String fileName, TReportTemplate tReportTemplate, Map<String, Object> textMap, Map<Integer, Map<Integer, List<String[]>>> autoTableMap, List<String> deleteFileStrList,Integer index,Integer totalNum,Boolean cleanFlag) {
+//        String returnMessage = "瀵煎嚭妯℃澘杞Щ閿欒:";
+//        InputStream in = null;
+//        FileOutputStream out = null;
+//        String zipFilePath = "";
+//        String reportName = "";
+//
+//        if(cleanFlag)
+//        {
+//            reportNameList = new ArrayList<>();
+//        }
+//
+//        try {
+//
+//            String reportType = tReportTemplate.getReportType();
+//            reportName = textMap.get("sendEmailFileName") + "_" + reportType + "_" + ReportTypeNameEnum.valueOf(tReportTemplate.getTemplateType()).getCode() + "_" + ReportTypeNameEnum.valueOf(tReportTemplate.getLangType()).getCode() + ".docx";
+//            reportName = reportName.replaceAll(" ", "_");
+//
+//            reportNameList.add(reportName);
+//
+//            //妯℃澘鏂囦欢闇�瑕佸姞閿�
+//            out = getDownLoadFileOutputStream(reportName);
+//
+//            long startTime1 = System.currentTimeMillis();
+//            setChageWord(fileName, out, textMap, tReportTemplate.getReportType(), tReportTemplate.getDataPath(), autoTableMap);
+//            // 鑾峰彇缁撴潫鏃堕棿
+//            long endTime1 = System.currentTimeMillis();
+//            // 璁$畻鑰楁椂锛堝崟浣嶏細姣锛�
+//            long duration1 = endTime1 - startTime1;
+//            log.info("setChageWord 绋嬪簭鎵ц鑰楁椂锛�" + duration1 + " 姣锛岀敓鎴愭姤鍛婏細"+reportName);
+//
+//            out.flush();
+//
+////            if(ReportTypeEnum.LAQ.getCode().equals(reportType)){
+////                // 鑾峰彇寮�濮嬫椂闂�
+////                long startTime = System.currentTimeMillis();
+////
+////                PdfUtil.dockerConvertPDF(EssConfig.getProfile(),EssConfig.getDocx2pdfPath(),reportName);
+////                // 鑾峰彇缁撴潫鏃堕棿
+////                long endTime = System.currentTimeMillis();
+////                // 璁$畻鑰楁椂锛堝崟浣嶏細姣锛�
+////                long duration = endTime - startTime;
+////                log.info("dockerConvertPDF 绋嬪簭鎵ц鑰楁椂锛�" + duration + " 姣锛岀敓鎴愭姤鍛婏細"+reportName);
+////            }
+//            if(Objects.equals(index, totalNum))
+//            {
+//                //骞惰杞崲
+//                execLAQ2PDF(reportNameList);
+//            }
+//
+//            zipFilePath = getPdfPath(reportName);
+//
+//            deleteFileStrList.add(EssConfig.getProfile() + "/" + reportName);
+//        } catch (Exception ex) {
+//            returnMessage = returnMessage + ex.getMessage();
+//            deleteFileStrList.add(EssConfig.getProfile() + "/" + reportName);
+//            log.error("瀵煎嚭妯℃澘杞Щ閿欒锛歿}\n妫�鏌ユ枃浠讹細" + fileName, returnMessage, ex);
+//        } finally {
+//            closeChannel(out);
+//            closeChannel(in);
+//        }
+//        return zipFilePath;
+//    }
+
+
+    private static void execLAQ2PDF(List<String> reportNames)
+    {
+        // 鑾峰彇寮�濮嬫椂闂�
+        long startTime = System.currentTimeMillis();
+        // 鎺у埗骞惰鎵ц鐨勬渶澶х嚎绋嬫暟
+        int parallelism = 2; // 璁剧疆涓轰綘甯屾湜鐨勫苟琛屾暟閲�
+
+        // 鍒涘缓涓�涓浐瀹氬ぇ灏忕殑绾跨▼姹�
+        ExecutorService executor = Executors.newFixedThreadPool(parallelism);
+
+        // 鍒涘缓涓�涓� CompletableFuture 鍒楄〃锛屾瘡涓� CompletableFuture 琛ㄧず涓�涓紓姝ヤ换鍔�
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+
+        // 鏋勫缓寮傛浠诲姟鍒楄〃
+        for (String reportName : reportNames) {
+            CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+                try {
+                    long oneTime = System.currentTimeMillis();
+                    PdfUtil.dockerConvertPDF(EssConfig.getProfile(), EssConfig.getDocx2pdfPath(), reportName);
+                    long twoTime = System.currentTimeMillis();
+                    long dura = twoTime - oneTime;
+                    log.info("杞崲鎴愬姛锛� " + reportName + " successfully.鑰楁椂锛�"+dura);
+                } catch (Exception e) {
+                    log.info("杞崲澶辫触锛� " + reportName + ": " + e.getMessage());
+                }
+            }, executor); // 浣跨敤鎸囧畾鐨勭嚎绋嬫睜鎵ц浠诲姟
+            futures.add(future);
+        }
+
+        // 绛夊緟鎵�鏈夊紓姝ヤ换鍔″畬鎴�
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
+        // 鍏抽棴绾跨▼姹�
+        executor.shutdown();
+        // 鑾峰彇缁撴潫鏃堕棿
+        long endTime = System.currentTimeMillis();
+        // 璁$畻鑰楁椂锛堝崟浣嶏細姣锛�
+        long duration = endTime - startTime;
+        log.info("execLAQ2PDF 绋嬪簭鎵ц鑰楁椂锛�" + duration + " 姣");
+        log.info("鎵�鏈夌嚎绋嬮兘鎵ц瀹屾垚锛�");
+    }
+
+
+
+
     @Nullable
     private static String getPositionIfJAQ(Map<String, Object> textMap, String reportType) {
         if (Objects.equals(reportType, "JAQ")) {
@@ -1205,10 +1461,14 @@
     private static String getPdfPath(String reportName) {
         return reportName.substring(0, reportName.lastIndexOf(".")) + ".pdf";
     }
+
+
+    //鍒犻櫎鏂囦欢
     public static void deleteFileByStr(List<String> deleteFileStrList) {
-        
+
         for (String deleteStr : deleteFileStrList) {
             File file = new File(deleteStr);
+            log.info("鍒犻櫎鏂囦欢锛�"+deleteStr);
             file.delete();
         }
     }
@@ -1240,7 +1500,7 @@
         }
         ZipUtil.toZip(fileList, zipOut);
     }
-    
+
     private static FileOutputStream getDownLoadFileOutputStream(String fileName) throws FileNotFoundException {
         File outFile = new File(EssConfig.getProfile() + "/" + fileName);
         if (!outFile.getParentFile().exists()) {
@@ -1248,21 +1508,46 @@
         }
         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);
+        ZipSecureFile.setMinInflateRatio(0.001);
+
         XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(getTemplateDownLoadPathByUpLoad(fileName)));
 
-        //璁剧疆鏂囨湰
-        changeText(document, textMap);
+        if (StringUtils.equals(reportType, ReportTypeEnum.JAQ.getCode())) {
+            //璁剧疆鏂囨湰妗�
+            changeTextBox(document, textMap);
 
-        //璁剧疆鏂囨湰妗�
-        changeTextBox(document, textMap);
+            //璁剧疆鏂囨湰
+            changeText(document, textMap);
+        }else {
+            //璁剧疆鏂囨湰
+            changeText(document, textMap);
 
-        //璁剧疆鍥捐〃
-        if (Objects.equals(reportType, ReportTypeEnum.PAQ.getCode())) {
-            PAQChart.changeChart(document, textMap);
+            //璁剧疆鏂囨湰妗�
+            changeTextBox(document, textMap);
         }
+
+//        //璁剧疆鏂囨湰妗�
+//        changeTextBox(document, textMap);
+//
+//        //璁剧疆鏂囨湰
+//        changeText(document, textMap);
+
+        //淇敼椤佃剼
+        changeFootNotes(document,textMap);
 
         //鎻掑叆琛ㄦ牸
         addTableValue(document, autoTableMap);
@@ -1271,12 +1556,61 @@
         changeTable(document, textMap);
 
         //璁剧疆鍥捐〃鎺т欢
-        changChar(textMap, document, reportType, templateType);
+        changChart(textMap, document, reportType,dataPath);
+
+        //濡傛灉鏄疞AQ鐨勫叏鏅浘锛岃缃浘琛�
+        if (StringUtils.equals(reportType, ReportTypeEnum.LAQ.getCode())&& textMap.containsKey("allList")){
+            LAQAllPng.changeChart(document,textMap);
+        }
+
         document.write(out);
     }
+
+    /**
+     * 淇敼椤佃剼锛堜富瑕佹槸鎶婂勾闄愮粰鎹簡锛�
+     * @param document
+     * @param textMap
+     * @throws DocumentException
+     */
+    private static void changeFootNotes(XWPFDocument document,Map<String,Object> textMap) throws DocumentException{
+
+        LocalDate currentDate = LocalDate.now();
+        int year = currentDate.getYear();
+
+        // 鑾峰彇鎵�鏈夐〉
+        List<XWPFFooter> footers = document.getFooterList();
+
+        for (XWPFFooter footer : footers) {
+            // 鑾峰彇姣忎釜椤佃剼鐨勬钀�
+            List<XWPFParagraph> paragraphs = footer.getParagraphs();
+
+            // 鎵撳嵃姣忎釜娈佃惤鐨勬枃鏈�
+            for (XWPFParagraph paragraph : paragraphs) {
+                System.out.println(paragraph.getText());
+
+                log.info("銆愰〉鑴氥�戯細{}",paragraph.getText());
+                if(paragraph.getText().contains("%year%"))
+                {
+                    // 鑾峰彇娈佃惤涓殑鎵�鏈塺un
+                    List<XWPFRun> runs = paragraph.getRuns();
+
+                    // 鏇挎崲鏂囨湰
+                    for (XWPFRun run : runs) {
+                        String text = run.getText(0);
+                        if (text != null && text.contains("%year%")) {
+                            text = text.replace("%year%", String.valueOf(year));
+                            run.setText(text, 0);
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
     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) {
@@ -1306,10 +1640,10 @@
         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;
@@ -1322,16 +1656,16 @@
             repText = repText.replaceAll("<BoldText>", "");
             repText = repText.replaceAll("</BoldText>", "");
         }
-        if (repText.indexOf("N/A NONE") != -1) {
+/*        if (repText.indexOf("N/A NONE") != -1) {
             repText = repText.replaceAll("N/A NONE", "");
-        }
+        }*/
         return repText;
     }
     public static void changTableColor(String fileName, OutputStream out, List<JAQTableStyle> jaqTableStyleList) throws IOException {
         if (StringUtils.isEmpty(fileName) || CollUtil.isEmpty(jaqTableStyleList)) {
             return;
         }
-        
+
         XWPFDocument document = new XWPFDocument(POIXMLDocument.openPackage(EssConfig.getProfile() + "/" + fileName));
         if (Objects.isNull(document)) {
             return;
@@ -1358,28 +1692,55 @@
 
     /**
      * 璁剧疆鍥炬爣鎺т欢
-     * @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()) || StringUtils.equals(reportType, ReportTypeEnum.MAQIAR.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 if (StringUtils.equals(reportType, ReportTypeEnum.CIAQ.getCode())) {
+                CIAQChart.changeChart(document, textMap);
+            } else if (StringUtils.equals(reportType, ReportTypeEnum.LAQ.getCode())) {
+                if(textMap.containsKey("allList"))
+                {
+                    log.info("銆愮敓鎴愬叏鏅浘鎶ュ憡銆�");
+                    //濡傛灉鍖呭惈allList锛屽垯娓叉煋鍏ㄦ櫙鍥惧浘琛�
+                    LAQAllChart.changeChart(document,textMap);
+                }
+                else
+                {
+                    log.info("鐢熸垚鐨勬槸涓汉鐢ㄦ埛鎶ュ憡");
+                    LAQChart.changeChart(document, textMap);
+                }
+            } else if(StringUtils.equals(reportType, ReportTypeEnum.API_Fan.getCode()))
+            {
+                APIFanChart.changeChart(document,textMap);
+            }
+            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();
@@ -1387,7 +1748,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();
@@ -1434,15 +1795,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);
-            
+
 
 
 
@@ -1513,13 +1874,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("绗竴涓槸鐢诲竷");
@@ -1560,18 +1921,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) {
@@ -1593,34 +1954,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;
                 }
@@ -1628,32 +1999,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);
@@ -1673,12 +2067,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)) {
@@ -1710,20 +2104,28 @@
         }*/
 
         try {
-            InputStream is = new FileInputStream("C:\\Users\\澶уご\\Desktop\\JAQ涓枃鐗�.docx");
+            InputStream is = new FileInputStream("C:\\Users\\Administrator\\Desktop\\JAQ涓枃鐗�.docx");
             XWPFDocument document = new XWPFDocument(is);
 
-            String result = "{\"T3Line21C\":\"0\",\"T4com8item1\":\"JAQ0027\",\"T1com8IF_H\":\"15.20\",\"T4com8item3\":\"JAQ0070\",\"T4com8item2\":\"JAQ0014\",\"T1com8IF_L\":\"15.20\",\"T1com8IF_M\":\"15.20\",\"T3item2\":\"JAQ0092\",\"T2com1I_L\":\"4.40\",\"T3item3\":\"JAQ0019\",\"T3item4\":\"JAQ0027\",\"T3item5\":\"JAQ0048\",\"T3item6\":\"JAQ0044\",\"T3item7\":\"JAQ0045\",\"T3item8\":\"JAQ0057\",\"T3item9\":\"JAQ0053\",\"T2com1I_H\":\"4.40\",\"T3item3IF_M\":\"20.00\",\"T3Line10C\":\"0\",\"T3Line22C\":\"0\",\"T3Line9C\":\"0\",\"T1com1IF_M\":\"17.60\",\"T1com1IF_L\":\"17.60\",\"T2com6I_L\":\"4.00\",\"T1com1IF_H\":\"17.60\",\"T1com4IF_M\":\"16.72\",\"T1com4IF_L\":\"16.72\",\"T3Line11C\":\"0\",\"T2com6I_H\":\"4.00\",\"T1com4IF_H\":\"16.72\",\"T3item16IF_M\":\"20.00\",\"T3com18\":\"1. 閫傚簲鎬у拰鍙橀潻绠$悊\",\"T4com6item1\":\"JAQ0114\",\"T3com17\":\"20. 鎺堟潈\",\"T4com6item3\":\"JAQ0050\",\"T3com19\":\"1. 閫傚簲鎬у拰鍙橀潻绠$悊\",\"T4com6item2\":\"JAQ0016\",\"T3Line8C\":\"0\",\"T3com10\":\"4. 娌熼�歕",\"T3item13IF_M\":\"20.00\",\"T3com12\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T3com11\":\"20. 鎺堟潈\",\"T3com14\":\"15. 璁″垝鍜岀粍缁嘰",\"T3Line23C\":\"0\",\"T3com13\":\"20. 鎺堟潈\",\"T3com16\":\"8. 鍥㈤槦鍗忎綔\",\"T3com15\":\"4. 娌熼�歕",\"T1com11IF_L\":\"14.44\",\"T1com11IF_M\":\"14.44\",\"T1com11IF_H\":\"14.44\",\"T2com1\":\"8. 鍥㈤槦鍗忎綔\",\"T2com2\":\"20. 鎺堟潈\",\"T3Line6C\":\"0\",\"T2com9\":\"24. 缁勭粐鏁忛攼搴",\"T2com7\":\"9. 鍚岀悊蹇僜",\"T2com8\":\"16. 鍒涢�犳�",\"T2com5\":\"4. 娌熼�歕",\"T3item7IF_M\":\"20.00\",\"T3Line7C\":\"0\",\"T2com6\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T3item24IF_M\":\"16.00\",\"T2com3\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T2Com5I_M\":\"4.00\",\"T2com4\":\"23. 婵�鍔变粬浜篭",\"T3Line12C\":\"0\",\"T3Line24C\":\"0\",\"T1com4\":\"20. 鎺堟潈\",\"T4com2item2\":\"JAQ0057\",\"T1com5\":\"4. 娌熼�歕",\"T4com2item3\":\"JAQ0020\",\"T1com6\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T1com7\":\"9. 鍚岀悊蹇僜",\"T4com2item1\":\"JAQ0045\",\"T1com8\":\"24. 缁勭粐鏁忛攼搴",\"T1com9\":\"26. 姝g洿銆佷俊浠诲拰鍏俊鍔沑",\"T2Com6I_M\":\"4.00\",\"T1com1\":\"8. 鍥㈤槦鍗忎綔\",\"T1com2\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T1com3\":\"23. 婵�鍔变粬浜篭",\"T2Line9C\":\"0\",\"T1com7IF_H\":\"15.20\",\"T2com5I_H\":\"4.00\",\"T1com7IF_M\":\"15.20\",\"T3Line13C\":\"0\",\"T1com7IF_L\":\"15.20\",\"T3Line25C\":\"0\",\"T2com5I_L\":\"4.00\",\"T1com2IF_M\":\"16.80\",\"T1com2IF_L\":\"16.80\",\"T1com2IF_H\":\"16.80\",\"琛�4瀛愰泦鍚圽":\"3\",\"T2rank1\":\"1\",\"T3item4IF_M\":\"20.00\",\"T2rank3\":\"3\",\"T3com21\":\"26. 姝g洿銆佷俊浠诲拰鍏俊鍔沑",\"T2rank2\":\"2\",\"T3com20\":\"20. 鎺堟潈\",\"T2rank5\":\"5\",\"T3com23\":\"24. 缁勭粐鏁忛攼搴",\"T2rank4\":\"4\",\"T3com22\":\"26. 姝g洿銆佷俊浠诲拰鍏俊鍔沑",\"T2rank7\":\"7\",\"T3com25\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T2rank6\":\"6\",\"T3com24\":\"23. 婵�鍔变粬浜篭",\"T2rank9\":\"9\",\"T3Line14C\":\"0\",\"T2rank8\":\"8\",\"T3item23IF_M\":\"16.00\",\"T3item25\":\"JAQ0016\",\"T3item24\":\"JAQ0015\",\"T3item23\":\"JAQ0014\",\"T1rank9\":\"9\",\"T3item22\":\"JAQ0090\",\"T3item21\":\"JAQ0095\",\"T3item20\":\"JAQ0129\",\"T1rank6\":\"6\",\"T1com3IF_M\":\"16.80\",\"T1rank5\":\"5\",\"T1com3IF_L\":\"16.80\",\"T1rank8\":\"8\",\"T1rank7\":\"7\",\"T1rank2\":\"2\",\"T1rank1\":\"1\",\"T1rank4\":\"4\",\"T1rank3\":\"3\",\"琛�1\":\"12\",\"琛�2\":\"12\",\"琛�3\":\"25\",\"琛�4\":\"8\",\"T1com3IF_H\":\"16.80\",\"T3Line15C\":\"0\",\"T4com1item3\":\"JAQ0042\",\"T3item8IF_M\":\"20.00\",\"T3item17IF_M\":\"20.00\",\"T4com7item3\":\"JAQ0100\",\"T3item19\":\"JAQ0128\",\"T3item18\":\"JAQ0006\",\"T4com7item1\":\"JAQ0044\",\"T3item12IF_M\":\"20.00\",\"T3item17\":\"JAQ0089\",\"T4com7item2\":\"JAQ0097\",\"T3item16\":\"JAQ0001\",\"T3item15\":\"JAQ0120\",\"T1com12IF_M\":\"14.40\",\"T3item14\":\"JAQ0002\",\"T3item13\":\"JAQ0076\",\"T3item12\":\"JAQ0114\",\"T3item11\":\"JAQ0105\",\"T3item10\":\"JAQ0102\",\"T3item1\":\"JAQ0008\",\"T1com12IF_H\":\"14.40\",\"T1com12IF_L\":\"14.40\",\"T2Com10I_M\":\"3.80\",\"T2com10I_H\":\"3.80\",\"T3Line16C\":\"0\",\"T2Com1I_M\":\"4.40\",\"T2com4I_H\":\"4.20\",\"T2com10I_L\":\"3.80\",\"T4com1item2\":\"JAQ0001\",\"T2com4I_L\":\"4.20\",\"T4com1item1\":\"JAQ0048\",\"T2Line4C\":\"0\",\"T3item5IF_M\":\"20.00\",\"T2com11I_H\":\"3.80\",\"T3Line1C\":\"1\",\"T3Line17C\":\"0\",\"T2Com2I_M\":\"4.40\",\"T2com11I_L\":\"3.80\",\"T2com9I_L\":\"4.00\",\"T2com9I_H\":\"4.00\",\"T2Line5C\":\"0\",\"T2Com7I_M\":\"4.00\",\"T2Line6C\":\"0\",\"T3Line18C\":\"0\",\"T2com12\":\"15. 璁″垝鍜岀粍缁嘰",\"T2Line11C\":\"1\",\"T2com10\":\"1. 閫傚簲鎬у拰鍙橀潻绠$悊\",\"T2com11\":\"3. 涓诲姩鎬",\"T4com5item3\":\"JAQ0034\",\"T4com5item1\":\"JAQ0102\",\"T4com5item2\":\"JAQ0120\",\"T4com3\":\"23. 婵�鍔变粬浜篭",\"T4com4\":\"20. 鎺堟潈\",\"T4com1\":\"8. 鍥㈤槦鍗忎綔\",\"T3item9IF_M\":\"20.00\",\"T3item22IF_M\":\"16.00\",\"T4com2\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T4com7\":\"9. 鍚岀悊蹇僜",\"T3item2IF_M\":\"20.00\",\"T4com8\":\"24. 缁勭粐鏁忛攼搴",\"T4com5\":\"4. 娌熼�歕",\"T2Com8I_M\":\"4.00\",\"T2Com11I_M\":\"3.80\",\"T4com6\":\"6. 鍘嬪姏蹇嶅彈-鎯呯华闊ф�",\"T2com3I_H\":\"4.20\",\"T3rank22\":\"22\",\"T3rank21\":\"21\",\"T3rank20\":\"20\",\"T2Line7C\":\"0\",\"T3Line19C\":\"0\",\"T2com3I_L\":\"4.20\",\"T3rank25\":\"25\",\"T3rank24\":\"24\",\"T3rank23\":\"23\",\"T2Line10C\":\"0\",\"T1com6IF_M\":\"15.20\",\"T1com6IF_L\":\"15.20\",\"T3item18IF_M\":\"16.00\",\"T1com6IF_H\":\"15.20\",\"T3item11IF_M\":\"20.00\",\"T2Line8C\":\"0\",\"T2com8I_L\":\"4.00\",\"T1com9IF_M\":\"15.20\",\"T3rank1\":\"1\",\"T2com8I_H\":\"4.00\",\"T3rank2\":\"2\",\"T3item10IF_M\":\"20.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\",\"T4com3item3\":\"JAQ0133\",\"T4com3item2\":\"JAQ0015\",\"T4com3item1\":\"JAQ0019\",\"T4rank8\":\"8\",\"T3item6IF_M\":\"20.00\",\"T4rank3\":\"3\",\"T4rank2\":\"2\",\"T4rank1\":\"1\",\"T3rank19\":\"19\",\"T2Line1C\":\"0\",\"T3rank18\":\"18\",\"T2Line12C\":\"1\",\"T3rank17\":\"17\",\"T3rank16\":\"16\",\"T2com12I_H\":\"3.80\",\"T3Line4C\":\"0\",\"T3item20IF_M\":\"16.00\",\"T2Com12I_M\":\"3.80\",\"T2Com3I_M\":\"4.20\",\"T3item14IF_M\":\"20.00\",\"T3rank11\":\"11\",\"T3rank10\":\"10\",\"T2com2I_H\":\"4.40\",\"T1com9IF_H\":\"15.20\",\"T2com12I_L\":\"3.80\",\"T3rank15\":\"15\",\"T3rank14\":\"14\",\"T2com2I_L\":\"4.40\",\"T3rank13\":\"13\",\"T1com9IF_L\":\"15.20\",\"T3rank12\":\"12\",\"T2rank10\":\"10\",\"T3item15IF_M\":\"20.00\",\"T2Line2C\":\"0\",\"T2rank12\":\"12\",\"T2rank11\":\"11\",\"T3Line3C\":\"0\",\"T1com10IF_M\":\"14.44\",\"T1com10IF_L\":\"14.44\",\"T2Com4I_M\":\"4.20\",\"T1com10IF_H\":\"14.44\",\"T3item25IF_M\":\"16.00\",\"T3item1IF_M\":\"20.00\",\"T3item21IF_M\":\"16.00\",\"T2com7I_L\":\"4.00\",\"T3com6\":\"9. 鍚岀悊蹇僜",\"T3com7\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T3Line20C\":\"0\",\"T2com7I_H\":\"4.00\",\"T3com8\":\"11. 瀹㈡埛瀵煎悜锛堝唴閮ㄥ拰澶栭儴锛塡",\"T3com9\":\"3. 涓诲姩鎬",\"T3com2\":\"16. 鍒涢�犳�",\"T3com3\":\"23. 婵�鍔变粬浜篭",\"T3com4\":\"24. 缁勭粐鏁忛攼搴",\"T2Line3C\":\"0\",\"T3com5\":\"8. 鍥㈤槦鍗忎綔\",\"T1rank12\":\"12\",\"T1rank11\":\"11\",\"T1rank10\":\"10\",\"T3Line2C\":\"0\",\"T1com5IF_H\":\"15.20\",\"T1com10\":\"1. 閫傚簲鎬у拰鍙橀潻绠$悊\",\"T1com11\":\"27. 琛屽姩鏋滄暍\",\"T2Com9I_M\":\"4.00\",\"T1com12\":\"16. 鍒涢�犳�",\"T3item19IF_M\":\"16.00\",\"T1com5IF_M\":\"15.20\",\"T3com1\":\"13. 搴旂敤鎵�涔犲緱鐨勪笓涓氱煡璇哱",\"T4com4item1\":\"JAQ0105\",\"T1com5IF_L\":\"15.20\",\"T4com4item2\":\"JAQ0076\",\"T4com4item3\":\"JAQ0089\"}";
-
+            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\\澶уご\\Desktop\\JAQ涓枃鐗�1.docx");
+            File file = new File("C:\\Users\\Administrator\\Desktop\\JAQ涓枃鐗�1.docx");
             FileOutputStream out = new FileOutputStream(file);
             document.write(out);
             out.flush();

--
Gitblit v1.9.1