From cb1de1bfcd43a578329c3291e109c74a6fd5042a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 1 Aug 2024 17:38:19 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"add=20=E6=96=87=E6=A1=A3=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E5=AF=BC=E5=87=BA=20=E5=A2=9E=E5=8A=A0=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E8=AF=91=E6=96=87"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ca028ee43b6c257b810817b4e938af1ebb5db7b0.
---
 .../split/dto/FileSpiltValTableExportDto.java |  2 -
 .../split/dto/FileSplitValImgExportDto.java   |  1 -
 .../impl/FileSplitItemsEOServiceImpl.java     | 78 +++----------------
 3 files changed, 11 insertions(+), 70 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/dto/FileSpiltValTableExportDto.java b/laws-modules/src/main/java/com/jero/modules/split/dto/FileSpiltValTableExportDto.java
index 2fccfb56..0724f4af 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/dto/FileSpiltValTableExportDto.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/dto/FileSpiltValTableExportDto.java
@@ -18,6 +18,4 @@ public class FileSpiltValTableExportDto {
     private List<List<SarFileSplitItemsTableEO>> tableEOList;
 
     private String tableHtCon;
-
-    private String tableHtConTranslation;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java b/laws-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java
index f02cb7ef..67ba9c37 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/dto/FileSplitValImgExportDto.java
@@ -13,5 +13,4 @@ public class FileSplitValImgExportDto {
     private String imgName;
 
     private String imgPath;
-    private String imgPathTranslation;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index f3faddcb..e192a147 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -3876,7 +3876,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     tableExportDto.setTableName("tableSheet" + tableName);
 //                    tableExportDto.setTableEOList(tableList);
                     tableExportDto.setTableHtCon(itemsValEO.getItemContent());
-                    tableExportDto.setTableHtConTranslation(itemsValEO.getTranslation());
                     allTableList.add(tableExportDto);
                     tableIndex++;
                     page.setTableIndex(tableIndex);
@@ -3885,7 +3884,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     splitContext(valContent);
 
                     String imgContent = itemsValEO.getItemContent();
-                    String imgTranslation = itemsValEO.getTranslation();
                     String imgUUIndex = "img" + String.valueOf(imgIndex);
                     if (MyStringUtils.isNotEmpty(imgContent)){
                         lastOne.setValContent(imgUUIndex+".png");
@@ -3893,10 +3891,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         FileSplitValImgExportDto fileSplitValImgExportDto = new FileSplitValImgExportDto();
                         fileSplitValImgExportDto.setImgName(imgUUIndex+".png");
                         String url = imgContent.substring(imgContent.lastIndexOf("=") + 1);
-                        String urlTranslation = imgTranslation.substring(imgTranslation.lastIndexOf("=") + 1);
 
                         fileSplitValImgExportDto.setImgPath(url);
-                        fileSplitValImgExportDto.setImgPathTranslation(urlTranslation);
 
                         allImgList.add(fileSplitValImgExportDto);
                         imgIndex++;
@@ -4117,15 +4113,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         HSSFRow row1 = sheetItems.createRow(allRow);
                         // 开始向单元格添加数据
                         for(int cellNum = 0; cellNum < fieldList.size(); cellNum++){
-                            String fieldName = fieldList.get(cellNum);
-                            FileSplitValExportDto fileSplitValExportDto = valList.get(valRow);
-                            if (!"item_content".equals(fieldName) &&
-                                    !"interpretation_articles".equals(fieldName) &&
-                                    !"translation".equals(fieldName) &&
-                                    ObjectUtils.isNotEmpty(exportDto.get(fieldName))) {
+                            if (!"item_content".equals(fieldList.get(cellNum)) &&
+                                    !"interpretation_articles".equals(fieldList.get(cellNum)) &&
+                                    ObjectUtils.isNotEmpty(exportDto.get(fieldList.get(cellNum)))) {
                                 // 处理文件
-                                if(fileList.contains(fieldName)) {
-                                    String connectId = (String) exportDto.get(fieldName);
+                                if(fileList.contains(fieldList.get(cellNum))) {
+                                    String connectId = (String) exportDto.get(fieldList.get(cellNum));
                                     List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(connectId);
                                     List<String> fileNameList = new ArrayList<>();
                                     if (ossFileList != null && !ossFileList.isEmpty()) {
@@ -4150,16 +4143,15 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                         allRelevFileList.addAll(ossFileList);
                                     }
                                 } else {
-                                    row1.createCell(cellNum).setCellValue(exportDto.get(fieldName).toString());
+                                    row1.createCell(cellNum).setCellValue(exportDto.get(fieldList.get(cellNum)).toString());
                                     row1.getCell(cellNum).setCellStyle(cellStyle);
                                 }
 
-                            }
-                            else if ("item_content".equals(fieldName)) {
+                            } else if ("item_content".equals(fieldList.get(cellNum))) {
                                 // 条款内容特殊处理
                                 HSSFCell cell2 = row1.createCell(cellNum);
                                 row1.getCell(cellNum).setCellStyle(cellStyle);
-                                String content = fileSplitValExportDto.getValContent();
+                                String content = valList.get(valRow).getValContent();
                                 if (StringUtils.isNotEmpty(content)) {
                                     content = content.replaceAll("null","");
                                     if (content.lastIndexOf("\n") > -1) {
@@ -4167,7 +4159,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     }
                                 }
 
-                                if("TABLE".equals(fileSplitValExportDto.getValType())){
+                                if("TABLE".equals(valList.get(valRow).getValType())){
                                     /* 连接跳转*/
                                     CreationHelper createHelper = workbook.getCreationHelper();
                                     Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.DOCUMENT);
@@ -4175,7 +4167,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     hyperlink1.setAddress(tableName);
                                     cell2.setHyperlink(hyperlink1);// 链接
                                     row1.getCell(cellNum).setCellStyle(cellStyleLink);
-                                } else if ("IMG".equals(fileSplitValExportDto.getValType())) {
+                                } else if ("IMG".equals(valList.get(valRow).getValType())) {
                                     /* 连接跳转*/
                                     CreationHelper createHelper = workbook.getCreationHelper();
                                     Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE);
@@ -4185,41 +4177,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     row1.getCell(cellNum).setCellStyle(cellStyleLink);
                                 }
                                 cell2.setCellValue(content); // IllegalArgumentException异常，excel单元格最大字符长度有限制
-                            }
-                            else if ("translation".equals(fieldName)) {
-                                // 条款内容特殊处理
-                                HSSFCell cell2 = row1.createCell(cellNum);
-                                row1.getCell(cellNum).setCellStyle(cellStyle);
-                                String content = exportDto.get(fieldName).toString();
-                                if (StringUtils.isNotEmpty(content)) {
-                                    content = content.replaceAll("null","");
-                                    if (content.lastIndexOf("\n") > -1) {
-                                        content = content.substring(0,content.lastIndexOf("\n"));
-                                    }
-                                }
-
-                                if("TABLE".equals(fileSplitValExportDto.getValType())){
-                                    /* 连接跳转*/
-                                    content = fileSplitValExportDto.getValContent()+"translation";
-                                    CreationHelper createHelper = workbook.getCreationHelper();
-                                    Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.DOCUMENT);
-                                    String tableName = "#\'"+ content + "\'!A1";
-                                    hyperlink1.setAddress(tableName);
-                                    cell2.setHyperlink(hyperlink1);// 链接
-                                    row1.getCell(cellNum).setCellStyle(cellStyleLink);
-                                } else if ("IMG".equals(fileSplitValExportDto.getValType())) {
-                                    /* 连接跳转*/
-                                    content = fileSplitValExportDto.getValContent()+"translation";
-                                    CreationHelper createHelper = workbook.getCreationHelper();
-                                    Hyperlink hyperlink1 = createHelper.createHyperlink(HyperlinkType.FILE);
-                                    String imgName = content;
-                                    hyperlink1.setAddress(imgName);
-                                    cell2.setHyperlink(hyperlink1);// 链接
-                                    row1.getCell(cellNum).setCellStyle(cellStyleLink);
-                                }
-                                cell2.setCellValue(content); // IllegalArgumentException异常，excel单元格最大字符长度有限制
-                            }
-                            else if ("interpretation_articles".equals(fieldName)) {
+                            } else if ("interpretation_articles".equals(fieldList.get(cellNum))) {
                                 // 条文解读特殊处理
                                 HSSFCell cell2 = row1.createCell(cellNum);
                                 row1.getCell(cellNum).setCellStyle(cellStyle);
@@ -4303,8 +4261,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 //                    HSSFSheet sheetTable = workbook.createSheet(tableExportDto.getTableName());
                     String tableName = tableExportDto.getTableName();
                     String tableHtml = tableExportDto.getTableHtCon();
-                    String tableHtmlTranslation = tableExportDto.getTableHtConTranslation();
-
                     if (StringUtils.isNotEmpty(tableHtml) && tableHtml.indexOf("<tbody>") < 0) {
                         if (tableHtml.indexOf("<thead>") < 0) {
                             tableHtml = tableHtml.replaceFirst("<tr>","<tbody><tr>");
@@ -4317,18 +4273,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     String cnt = "\n";
                     tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
                     workbook = ConvertHtml2Excel.table2Excel(tableHtml,workbook,tableName);
-
-                    if (StringUtils.isNotEmpty(tableHtmlTranslation) && tableHtmlTranslation.indexOf("<tbody>") < 0) {
-                        if (tableHtmlTranslation.indexOf("<thead>") < 0) {
-                            tableHtmlTranslation = tableHtmlTranslation.replaceFirst("<tr>","<tbody><tr>");
-                            tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</table>","</tbody></table>");
-                        } else {
-                            tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</thead>","</thead><tbody>");
-                            tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</table>","</tbody></table>");
-                        }
-                    }
-                    tableHtmlTranslation = tableHtmlTranslation.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
-                    workbook = ConvertHtml2Excel.table2Excel(tableHtmlTranslation,workbook,tableName+"translation");
 //                    for (int r=0;r<rowtableList.size();r++) {
 //                        List<SarFileSplitItemsTableEO> colTableList = rowtableList.get(r);
 //                        HSSFRow tRow = sheetTable.createRow(colTableList.get(0).getRowNum()-1);