From 8da69c8dc51a0ed0234fff91591ae602a20cb828 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 27 Jun 2024 09:57:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2):=20ex?=
 =?UTF-8?q?cel=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=A0=BC=E6=9C=80=E5=A4=A7=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsHomeSearchServiceImpl.java       | 28 ++++++++++++++-----
 .../LawsHomeAdvancedSearchExportExcelVO.java  | 15 ++++++++--
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index 2aa7968b..826e3c46 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -18,7 +18,6 @@ import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.BeanCopyUtils;
-import com.jero.common.util.SnowflakeUtils;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.document.utils.ReadPdfUtil;
 import com.jero.modules.document.utils.ReadWordUtil;
@@ -52,6 +51,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.shiro.SecurityUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -1290,6 +1290,8 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
     @Override
     public ModelAndView advancedSearchExportExcel(Map<String, Object> parameterMap) {
         String resourceType = String.valueOf(parameterMap.get("resourceType"));
+        // 导出数据前调用
+        initCellMaxTextLength();
         if (LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD.equals(resourceType)){
             // 外来标准法规
             return exportExcelByDomestic(parameterMap);
@@ -1305,6 +1307,24 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         }
     }
 
+    /**
+     * 初始化 cell 内容长度
+     * 	   cell 原本内容长度限制 32767  现修改为Integer.MAX_VALUE
+     */
+    public static void initCellMaxTextLength() {
+        SpreadsheetVersion excel2007 = SpreadsheetVersion.EXCEL2007;
+        if (Integer.MAX_VALUE != excel2007.getMaxTextLength()) {
+            Field field;
+            try {
+                field = excel2007.getClass().getDeclaredField("_maxTextLength");
+                field.setAccessible(true);
+                field.set(excel2007,Integer.MAX_VALUE);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     private ModelAndView exportExcelByAll(Map<String, Object> parameterMap) {
         parameterMap.put("pageNo", "1");
         parameterMap.put("pageSize", "-1");
@@ -1900,10 +1920,4 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
             log.error("文档库添加es失败",e);
         }
     }
-
-    public static void main(String[] args) {
-        for (int i = 0; i < 14; i++) {
-            System.out.println(SnowflakeUtils.snowflake());
-        }
-    }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java
index 424abf1e..bc5fe4c3 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java
@@ -20,7 +20,7 @@ public class LawsHomeAdvancedSearchExportExcelVO implements Serializable {
      * 资源类型 1:外来标准法规 3:企业标准
      */
     @ApiModelProperty(value = "资源类型 1:外来标准法规 3:企业标准")
-    @Excel(name = "资源类型", replace = {"外来标准法规_1", "企业标准_3"}, width = 20)
+//    @Excel(name = "资源类型", replace = {"外来标准法规_1", "企业标准_3"}, width = 20)
     private String resourceType;
 
     /**
@@ -50,7 +50,18 @@ public class LawsHomeAdvancedSearchExportExcelVO implements Serializable {
     @ApiModelProperty(value = "实施日期")
     @Excel(name = "实施日期", width = 20, format = "yyyy-MM-dd")
     private Date implementationDate;
-
+    /**
+     * 在产车实施日期
+     * */
+    @Excel(name = "新认证车实施日期", width = 20, format = "yyyy-MM-dd")
+    @ApiModelProperty(value = "新认证车实施日期")
+    private java.lang.String newAuthImplDate;
+    /**
+     * 新车型实施日期
+     * */
+    @Excel(name = "新生产车实施日期",  width = 20, format = "yyyy-MM-dd")
+    @ApiModelProperty(value = "新生产车实施日期")
+    private java.lang.String newProductImplDate;
     /**
      * 标准状态
      */