From afae2409d65e0c044b8119b3fd8f57e438c18a08 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 09 十一月 2025 21:29:24 +0800
Subject: [PATCH] 修改了大量的代码块

---
 archiveManager/pom.xml                                                                        |    8 
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFour.java             | 1024 ++++++++++++++++++++++++++++++++++++++++++++
 ruoyi-admin/pom.xml                                                                           |   10 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java      |   90 +++
 archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java             |    2 
 ruoyi-common/pom.xml                                                                          |   22 
 archiveManager/src/main/java/com/ruoyi/service/IArchiveDoublePdfGenerateService.java          |    6 
 archiveManager/src/main/java/com/ruoyi/service/impl/IArchiveDoublePdfGenerateServiceImpl.java |  109 ++--
 archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java               |   43 +
 archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java                    |    8 
 archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java                |    2 
 archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java                 |    5 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DoublePdfGenerateController.java   |   25 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java   |    4 
 archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java         |   10 
 15 files changed, 1,286 insertions(+), 82 deletions(-)

diff --git a/archiveManager/pom.xml b/archiveManager/pom.xml
index ecebf4c..d51a0d8 100644
--- a/archiveManager/pom.xml
+++ b/archiveManager/pom.xml
@@ -87,6 +87,14 @@
             <artifactId>httpclient</artifactId>
             <version>4.5.14</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
 
     </dependencies>
 
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
index 55f6900..ebfc326 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialFileSmallVo.java
@@ -51,7 +51,7 @@
     private String retentionPeriod;
 
     /** $column.columnComment */
-    @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��,鏅��=鏅��")
+    @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��,鏅��=鏅��,鍐呴儴鐢ㄥ浘=鍐呴儴鐢ㄥ浘,鍐呴儴鐢ㄩ��=鍐呴儴鐢ㄩ��,绉樺瘑=绉樺瘑")
     private String securityLevel;
 
     /** $column.columnComment */
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java
new file mode 100644
index 0000000..248aa8f
--- /dev/null
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java
@@ -0,0 +1,43 @@
+package com.ruoyi.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DocumentMaterialsFileList {
+
+
+
+
+    private String recordId;
+
+    private String inquiryNumber;
+
+    private String caseTitle;
+    @Excel(name="搴忓彿")
+    private Long num;
+    @Excel(name = "鏂囦欢缂栧彿")
+    private String documentNumber;
+
+    @Excel(name = "鏂囦欢棰樺悕")
+    private String title;
+
+
+    @Excel(name = "椤靛彿")
+    private Long pageNumber;
+
+    @Excel(name = "鏄惁鏈夊叾浠栦粙璐�")
+    private String fileStyle1;
+
+    @Excel(name = "鏂囦欢绫诲瀷")
+    private String fileStyle;
+    @Excel(name = "淇濈鏈熼檺")
+    private String retentionPeriod;
+    @Excel(name = "鍏紑灞炴��")
+    private String publicity;
+    @Excel(name = "澶囨敞")
+    private String remarks;
+}
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java
index ba2c4f6..594b4cd 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsVoLarge.java
@@ -271,7 +271,7 @@
     private String retentionPeriod;
 
     /** $column.columnComment */
-    @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��,鏅��=鏅��")
+    @Excel(name = "瀵嗙骇", readConverterExp = "璇ラ〉鍙﹀瓨=鏅��,鏅��=鏅��,鍐呴儴鐢ㄥ浘=鍐呴儴鐢ㄥ浘,鍐呴儴鐢ㄩ��=鍐呴儴鐢ㄩ��,绉樺瘑=绉樺瘑")
     private String securityLevel;
 
     /** $column.columnComment */
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
index a0fc494..d27ea19 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.DocumentMaterials;
 import com.ruoyi.domain.vo.DocumentMaterialFileStyle;
+import com.ruoyi.domain.vo.DocumentMaterialsFileList;
 import com.ruoyi.domain.vo.DocumentMaterialsVo;
 import com.ruoyi.domain.vo.DocumentMaterialsVoLarge;
 import org.apache.ibatis.annotations.Mapper;
@@ -52,7 +53,12 @@
             "            from document_materials as dm, archive_records as ar WHERE dm.record_id=ar.id \n" +
             "and dm.record_id=#{recordId} and file_style!='鍏跺畠鏉愭枡' ")
     List<DocumentMaterialsVoLarge> getDocumentMaterialsvoLarge(@Param("recordId") int recordId);
-
+    @Select(  "select ROW_NUMBER() OVER (ORDER BY page_number) AS num,file_style, ar.record_id, ar.inquiry_number, ar.case_title, " +
+            "            document_number, title, page_number, \n" +
+            "            publicity, dm.retention_period, dm.remarks\n" +
+            "            from document_materials as dm, archive_records as ar WHERE dm.record_id=ar.id \n" +
+            "and dm.record_id=#{recordId} and file_style!='鍏跺畠鏉愭枡' ")
+    List<DocumentMaterialsFileList> getDocumentMaterialsFileList(@Param("recordId") int recordId);
     @Select("select count(*) as cnt, file_style from document_materials " +
             "where record_id=#{recordId} GROUP BY file_style")
 
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiveDoublePdfGenerateService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiveDoublePdfGenerateService.java
index 24edcaf..05242cc 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiveDoublePdfGenerateService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiveDoublePdfGenerateService.java
@@ -1,7 +1,11 @@
 package com.ruoyi.service;
 
+import com.ruoyi.common.core.domain.AjaxResult;
+import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
 
 public interface IArchiveDoublePdfGenerateService {
-    public void testConnection() throws IOException;
+    public AjaxResult testConnection(MultipartFile file) throws IOException;
+    public AjaxResult getDownLoadInfo(String id);
 }
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
index a3a910a..7abb2ba 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
@@ -4,6 +4,7 @@
 import com.ruoyi.domain.Archiverecordstouser;
 import com.ruoyi.domain.DocumentMaterials;
 import com.ruoyi.domain.vo.DocumentMaterialFileStyle;
+import com.ruoyi.domain.vo.DocumentMaterialsFileList;
 import com.ruoyi.domain.vo.DocumentMaterialsVo;
 import com.ruoyi.domain.vo.DocumentMaterialsVoLarge;
 import org.apache.ibatis.annotations.Param;
@@ -38,6 +39,8 @@
 
     public List<DocumentMaterialsVoLarge> selectDocumentMaterialsAllByRecordId(Long id);
 
+
+    public List<DocumentMaterialsFileList> selectDocumentMaterialsFileList(Long id);
     /**
      * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
      *
@@ -76,6 +79,8 @@
 
     public List<DocumentMaterialFileStyle> findFileStyleInfo(@Param("recordId") int recordId);
 
+
+
     public AjaxResult importExcel(MultipartFile file, String recordId);
 
 
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
index eb969ee..c98e310 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -11,10 +11,7 @@
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ArchiveCategory;
 import com.ruoyi.domain.DocumentMaterials;
-import com.ruoyi.domain.vo.DocumentMaterialFileSmallVo;
-import com.ruoyi.domain.vo.DocumentMaterialFileStyle;
-import com.ruoyi.domain.vo.DocumentMaterialsVo;
-import com.ruoyi.domain.vo.DocumentMaterialsVoLarge;
+import com.ruoyi.domain.vo.*;
 import com.ruoyi.mapper.DocumentMaterialsMapper;
 import com.ruoyi.service.IDocumentMaterialsService;
 import com.ruoyi.util.ErrorcodeExceptionextends;
@@ -120,6 +117,11 @@
     }
 
     @Override
+    public List<DocumentMaterialsFileList> selectDocumentMaterialsFileList(Long id) {
+        return this.baseMapper.getDocumentMaterialsFileList(Math.toIntExact(id));
+    }
+
+    @Override
     public int insertDocumentMaterials(DocumentMaterials documentMaterials) {
         LocalDateTime time = LocalDateTime.now();
 
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/IArchiveDoublePdfGenerateServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/IArchiveDoublePdfGenerateServiceImpl.java
index 6b4c30d..20c9347 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/IArchiveDoublePdfGenerateServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/IArchiveDoublePdfGenerateServiceImpl.java
@@ -1,22 +1,21 @@
 package com.ruoyi.service.impl;
 
 import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.service.IArchiveDoublePdfGenerateService;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.ParseException;
-import org.apache.http.client.ClientProtocolException;
+
 
 import cn.hutool.http.HttpRequest;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.springframework.stereotype.Service;
 
-import java.io.File;
-import java.io.IOException;
+
+import org.apache.commons.io.IOUtils;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+
+import java.io.*;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -51,57 +50,53 @@
     }
 
 
-    public void testConnection() throws IOException {
-        File pdfFile = new File("34.pdf");
-        String base64 = java.util.Base64.getEncoder().encodeToString(Files.readAllBytes(pdfFile.toPath()));
+    public AjaxResult testConnection(MultipartFile multipartFile) throws IOException {
 
+
+        // 鍒涘缓涓存椂鏂囦欢
+        File file = File.createTempFile("temp", ".pdf");
+        // 灏� MultipartFile 杞瓨鍒扮洰鏍囨枃浠�
+        multipartFile.transferTo(file);
+
+        String response = HttpRequest.post("http://127.0.0.1:1224/api/doc/upload")
+                .contentType("multipart/form-data; boundary=<calculated when request is sent>")
+                .form("file", file)
+                .execute()
+                .body();
+
+        System.out.println(response);
+
+
+        JSONObject json = JSONUtil.parseObj(response);
+
+
+
+       // System.out.println(json.get("data"));
+
+
+
+
+
+        return AjaxResult.success(json);
+       // unicodeEscapeToChinese(response);
+      //  System.out.println(res);
+     //   unicodeEscapeToChinese(res);
+
+    }
+
+    @Override
+    public AjaxResult getDownLoadInfo(String id) {
         JSONObject inputObject = new JSONObject();
-        inputObject.put("base64", base64);
-        //inputObject.put("options", new JSONObject().put("ocr.language", "models/config_chinese.txt"));
-
-        String response = HttpRequest.post(OCRServer+ "api/doc/result")
+        inputObject.put("id", id);
+        String res = HttpRequest.post("http://127.0.0.1:1224/api/doc/download")
+                //   .contentType("multipart/form-data; boundary=<calculated when request is sent>")
+                //.form("file", file)
                 .body(inputObject.toString())
                 .contentType("application/json")
                 .execute()
                 .body();
-        unicodeEscapeToChinese(response);
-       // System.out.println("unicodeEscapeToChinese("\u672a\u586b\u5199id\u3002"));
-//        // 鑾峰緱Http瀹㈡埛绔�(鍙互鐞嗚В涓�:浣犲緱鍏堟湁涓�涓祻瑙堝櫒;娉ㄦ剰:瀹為檯涓奌ttpClient涓庢祻瑙堝櫒鏄笉涓�鏍风殑)
-//        CloseableHttpClient httpClient = HttpClientBuilder.create().build();
-//        // 鍒涘缓Get璇锋眰
-//        HttpGet httpGet = new HttpGet(OCRServer);
-//
-//        // 鍝嶅簲妯″瀷
-//        CloseableHttpResponse response = null;
-//        try {
-//            // 鐢卞鎴风鎵ц(鍙戦��)Get璇锋眰
-//            response = httpClient.execute(httpGet);
-//            // 浠庡搷搴旀ā鍨嬩腑鑾峰彇鍝嶅簲瀹炰綋
-//            HttpEntity responseEntity = response.getEntity();
-//            System.out.println("鍝嶅簲鐘舵�佷负:" + response.getStatusLine());
-//            if (responseEntity != null) {
-//                System.out.println("鍝嶅簲鍐呭闀垮害涓�:" + responseEntity.getContentLength());
-//                System.out.println("鍝嶅簲鍐呭涓�:" + EntityUtils.toString(responseEntity));
-//            }
-//        } catch (ClientProtocolException e) {
-//            e.printStackTrace();
-//        } catch (ParseException e) {
-//            e.printStackTrace();
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        } finally {
-//            try {
-//                // 閲婃斁璧勬簮
-//                if (httpClient != null) {
-//                    httpClient.close();
-//                }
-//                if (response != null) {
-//                    response.close();
-//                }
-//            } catch (IOException e) {
-//                e.printStackTrace();
-//            }
-//        }
+        JSONObject json = JSONUtil.parseObj(res);
+        return AjaxResult.success(json);
 
     }
 
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 0fce8bd..37417c9 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -140,7 +140,15 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
                 </configuration>   
-           </plugin>   
+           </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
index f50a90b..41aa1c2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java
@@ -1,21 +1,28 @@
 package com.ruoyi.web.controller.archive;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.common.utils.poi.ExcelExp;
+import com.ruoyi.common.utils.poi.ExcelUtilManySheetFour;
+import com.ruoyi.common.utils.poi.ExcelUtilManySheetSecond;
 import com.ruoyi.domain.ArchiveRecords;
-import com.ruoyi.domain.vo.AnalysisResult;
-import com.ruoyi.domain.vo.ArchiveRecordModelExp;
-import com.ruoyi.domain.vo.ArchiveRecordModelOther;
-import com.ruoyi.domain.vo.DocumentMaterialFileSmallVo;
+import com.ruoyi.domain.DocumentMaterials;
+import com.ruoyi.domain.vo.*;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.service.IArchiveRecordsService;
+import com.ruoyi.service.IDocumentMaterialsService;
+import com.ruoyi.service.impl.BarcodeService;
+import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -43,9 +50,11 @@
 {
     @Autowired
     private IArchiveRecordsService archiveRecordsService;
+    @Autowired
+    private BarcodeService barcodeService;
 
-
-
+    @Autowired
+    private IDocumentMaterialsService iDocumentMaterialsService;
     /**
      * 鏌ヨ妗f瀹屾垚鎯呭喌
      */
@@ -99,7 +108,10 @@
     {
         List<ArchiveRecords> list = archiveRecordsService.selectArchiveRecordsList(archiveRecords);
         ExcelUtil<ArchiveRecords> util = new ExcelUtil<ArchiveRecords>(ArchiveRecords.class);
+        //util.showColumn();
         util.exportExcel(response, list, "妗f璁板綍鏁版嵁");
+       // response.getB
+      //  response.
     }
 
     /**
@@ -208,4 +220,70 @@
     {
         return AjaxResult.success( archiveRecordsService.whether(recordId));
     }
+
+    @PostMapping(value={"/recordFileList/{includeQrCode}/{selectedSignatures}/{selectedAnnotations}", "/recordFileList/{includeQrCode}", "/recordFileList/{includeQrCode}/{selectedSignatures}","/recordFileList/{includeQrCode}/{selectedAnnotations}"})
+    //瀵煎嚭excle
+    public void getSpecialArchiveInfo(HttpServletResponse response, @RequestParam("recordId")Long recordId, @PathVariable(name = "includeQrCode",required = false) boolean includeQrCode, @PathVariable(name = "selectedSignatures",required = false) int[] selectedSignatures, @PathVariable(name = "selectedAnnotations",required = false) int[] selectedAnnotations) throws IOException {
+        System.out.println("uuuuuuuuuuuuuuuuuuusssss88888888888888");
+//        System.out.println(selectedSignatures[0]);
+//        System.out.println(selectedAnnotations[0]);
+        System.out.println(includeQrCode);
+        //浜岀淮鐮佹槸鍚︾敓鎴�
+        String code = "2024050000029250";
+        byte [] bt = barcodeService.generateBarcodeImage(code);
+        //绛惧悕閫夋嫨
+        String [] sig = {"涓氬姟绉戝绉讳氦浜�:","瀹℃壒绉戠Щ浜や汉:","妗f鏁寸悊鍏徃:"};
+        List<String> arrLis = new ArrayList<>();
+        if(selectedSignatures!=null){
+            for(int si: selectedSignatures)
+            {
+                arrLis.add(sig[si-1]);
+            }
+        }
+        //娉ㄩ�夋嫨
+        String [] ann = { "鏈竻鍗曠敱妗f褰㈡垚閮ㄩ棬瀹屾垚",
+                "鏂囦欢绫诲瀷蹇呴』褰曞叆锛屽寘鎷粨璁烘潗鏂欍�佽繃绋嬫潗鏂欍�佺敵璇锋潗鏂欙紝鍏朵粬鏉愭枡",
+                "鍏紑灞炴�у繀椤诲綍鍏ワ紝涓诲姩鍏紑銆佷緷鐢宠鍏紑銆佸厤浜堝叕寮�",
+                "淇濈鏈熼檺:30骞存垨姘镐箙",
+                "椤靛彿鎸夌収姝e紡褰曞叆椤电爜涓哄噯"};
+        List<String> arrAn = new ArrayList<>();
+        if(selectedAnnotations!=null) {
+            for (int ar : selectedAnnotations) {
+                arrAn.add(ann[ar - 1]);
+            }
+        }
+        List<DocumentMaterialsFileList> arsi = new ArrayList<>();
+//        DocumentMaterials documentMaterials = new DocumentMaterials();
+//        documentMaterials.setRecordId(recordId);
+        List<DocumentMaterialsFileList> lst = iDocumentMaterialsService.selectDocumentMaterialsFileList(recordId);
+
+
+
+        // 澶嶅埗灞炴�у埌SmallObject鍒楄〃
+        for (DocumentMaterialsFileList bigObject : lst) {
+            DocumentMaterialsFileList smallObject = new DocumentMaterialsFileList();
+            BeanUtil.copyProperties(bigObject, smallObject); // 澶嶅埗灞炴��
+            arsi.add(smallObject);
+        }
+
+      //  arsi.add(aIV);
+        ExcelExp e3 = new ExcelExp("鏂囦欢鏉愭枡绉讳氦鐩綍娓呭崟",arsi, DocumentMaterialsFileList.class);
+       // ExcelExp e4 = new ExcelExp("妗堝嵎灏侀潰",  arsi, recordId1, imgr1,sedcode, ArchiveInfoVo.class);
+        List<ExcelExp> mysheet1 = new ArrayList<ExcelExp>();
+        mysheet1.add(e3);
+       // mysheet1.add(e4);
+        //ByteOutputStream bos2 = new ByteOutputStream();
+        ExcelUtilManySheetFour<List<ExcelExp>> util3 = new ExcelUtilManySheetFour<List<ExcelExp>>(mysheet1);
+
+
+        //鎷垮埌caseTitle鍜宨nquiryNumber
+        String inquiryNumber = "";
+        String caseTitle = "";
+        if(!arsi.isEmpty())
+        {
+            inquiryNumber = arsi.get(0).getInquiryNumber();
+            caseTitle = arsi.get(0).getCaseTitle();
+        }
+        util3.exportExcelManySheet(response, mysheet1, includeQrCode,bt, arrLis, arrAn, inquiryNumber, caseTitle);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index c833c43..2911d98 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -182,7 +182,7 @@
                     //鏇挎崲涓轰簡鍑嗗濂界殑鍥惧儚
                     //璇诲彇鏈嶅姟鍣ㄤ笂鐨勫浘鍍�
                  //   new InputStream();
-                    String fp = filePath + "\\0071.jpg";
+                    String fp = filePath + "\\glc.jpg";
                     Path path = Paths.get(fp);
                     File fil = new File(fp);
                     //鎷垮埌鍥惧儚灞炴��
@@ -304,4 +304,6 @@
         ExcelUtil<DocumentMaterialFileSmallVo> util = new ExcelUtil<>(DocumentMaterialFileSmallVo.class);
         util.exportExcel(response,list,"妗f璇︾粏淇℃伅瀵煎叆妯℃澘");
     }
+
+    //瀵煎嚭material
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DoublePdfGenerateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DoublePdfGenerateController.java
index e8cf77c..50f8abf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DoublePdfGenerateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DoublePdfGenerateController.java
@@ -7,9 +7,8 @@
 import com.ruoyi.domain.ArchiveCategory;
 import com.ruoyi.service.IArchiveDoublePdfGenerateService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 
@@ -17,16 +16,24 @@
 import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
 @Anonymous
 @RestController
-@RequestMapping("/doublePdf")
+@RequestMapping("/system/doublePdf")
 
 public class DoublePdfGenerateController {
     @Autowired
     private IArchiveDoublePdfGenerateService iArchiveDoublePdfGenerateService;
 
-    @GetMapping("/testConn")
-    public AjaxResult testCon() throws IOException {
-        iArchiveDoublePdfGenerateService
-                .testConnection();
-        return AjaxResult.success("2134");
+    @PostMapping("/upload")
+    public AjaxResult getOriginalPdf(@RequestParam("file") MultipartFile file) throws IOException {
+        AjaxResult ar = iArchiveDoublePdfGenerateService
+                .testConnection(file);
+        System.out.println(file);
+        return ar;
+    }
+    @GetMapping("downLoadFile/{id}")
+    public AjaxResult getPdfDownLoad(@PathVariable String id )
+    {
+        AjaxResult ar = iArchiveDoublePdfGenerateService
+                .getDownLoadInfo(id);
+        return ar;
     }
 }
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 38f3dcc..1ab596b 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -143,5 +143,27 @@
         </dependency>
 
     </dependencies>
+<!--    <build>-->
+<!--        <plugins>-->
 
+<!--        <plugin>-->
+<!--        <groupId>org.apache.maven.plugins</groupId>-->
+<!--        <artifactId>maven-compiler-plugin</artifactId>-->
+<!--        <version>3.0</version>-->
+<!--        <configuration>-->
+<!--            <compilerArguments>-->
+<!--                <Xlint />-->
+<!--            </compilerArguments>-->
+<!--            <verbose>true</verbose>-->
+<!--            <source>${java.version}</source>-->
+<!--            <target>${java.version}</target>-->
+<!--            <showWarnings>true</showWarnings>-->
+<!--            <compilerArguments>-->
+<!--                <verbose />-->
+<!--                <bootclasspath>{java.home}/../jre/lib/rt.jar</bootclasspath>-->
+<!--            </compilerArguments>-->
+<!--        </configuration>-->
+<!--    </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
 </project>
\ No newline at end of file
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFour.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFour.java
new file mode 100644
index 0000000..336aeb0
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFour.java
@@ -0,0 +1,1024 @@
+package com.ruoyi.common.utils.poi;
+
+
+
+
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileTypeUtils;
+import com.ruoyi.common.utils.file.ImageUtils;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Excel鐩稿叧澶勭悊
+ *
+ * @author ruoyi
+ */
+public class ExcelUtilManySheetFour<T> {
+    private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
+
+    /**
+     * Excel sheet鏈�澶ц鏁帮紝榛樿65536
+     */
+    public static final int sheetSize = 65536;
+
+    /**
+     * 宸ヤ綔琛ㄥ悕绉�
+     */
+    private String sheetName;
+
+    /**
+     * 瀵煎嚭绫诲瀷锛圗XPORT:瀵煎嚭鏁版嵁锛汭MPORT锛氬鍏ユā鏉匡級
+     */
+    private Excel.Type type;
+
+    /**
+     * 宸ヤ綔钖勫璞�
+     */
+    private Workbook wb;
+
+    /**
+     * 宸ヤ綔琛ㄥ璞�
+     */
+    private Sheet sheet;
+
+    /**
+     * 鏍峰紡鍒楄〃
+     */
+    private Map<String, CellStyle> styles;
+
+    /**
+     * 瀵煎叆瀵煎嚭鏁版嵁鍒楄〃
+     */
+    private List<T> list;
+
+    /**
+     * 娉ㄨВ鍒楄〃
+     */
+    private List<Object[]> fields;
+
+    /**
+     * 鏈�澶ч珮搴�
+     */
+    private short maxHeight;
+
+    /**
+     * 缁熻鍒楄〃
+     */
+    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
+
+    /**
+     * 鏁板瓧鏍煎紡
+     */
+    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
+
+    /**
+     * 瀹炰綋瀵硅薄
+     */
+    public Class<T> clazz;
+
+    public List<ExcelExp> clazzlist;
+
+    public ExcelUtilManySheetFour(List<ExcelExp> clazzlist) {
+        this.clazzlist = clazzlist;
+    }
+
+    public void init(List<T> list, String sheetName, Excel.Type type) {
+        if (list == null) {
+            list = new ArrayList<T>();
+        }
+        this.list = list;
+        this.sheetName = sheetName;
+        this.type = type;
+        createExcelField();
+    }
+
+    /**
+     * 瀵筫xcel琛ㄥ崟榛樿绗竴涓储寮曞悕杞崲鎴恖ist
+     *
+     * @param is 杈撳叆娴�
+     * @return 杞崲鍚庨泦鍚�
+     */
+    public List<T> importExcel(InputStream is) throws Exception {
+        return importExcel(StringUtils.EMPTY, is);
+    }
+
+    /**
+     * 瀵筫xcel琛ㄥ崟鎸囧畾琛ㄦ牸绱㈠紩鍚嶈浆鎹㈡垚list
+     *
+     * @param sheetName 琛ㄦ牸绱㈠紩鍚�
+     * @param is        杈撳叆娴�
+     * @return 杞崲鍚庨泦鍚�
+     */
+    public List<T> importExcel(String sheetName, InputStream is) throws Exception {
+        this.type = Excel.Type.IMPORT;
+        this.wb = WorkbookFactory.create(is);
+        List<T> list = new ArrayList<T>();
+        Sheet sheet = null;
+        if (StringUtils.isNotEmpty(sheetName)) {
+            // 濡傛灉鎸囧畾sheet鍚�,鍒欏彇鎸囧畾sheet涓殑鍐呭.
+            sheet = wb.getSheet(sheetName);
+        } else {
+            // 濡傛灉浼犲叆鐨剆heet鍚嶄笉瀛樺湪鍒欓粯璁ゆ寚鍚戠1涓猻heet.
+            sheet = wb.getSheetAt(0);
+        }
+
+        if (sheet == null) {
+            throw new IOException("鏂囦欢sheet涓嶅瓨鍦�");
+        }
+
+        int rows = sheet.getPhysicalNumberOfRows();
+
+        if (rows > 0) {
+            // 瀹氫箟涓�涓猰ap鐢ㄤ簬瀛樻斁excel鍒楃殑搴忓彿鍜宖ield.
+            Map<String, Integer> cellMap = new HashMap<String, Integer>();
+            // 鑾峰彇琛ㄥご
+            Row heard = sheet.getRow(0);
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
+                Cell cell = heard.getCell(i);
+                if (StringUtils.isNotNull(cell)) {
+                    String value = this.getCellValue(heard, i).toString();
+                    cellMap.put(value, i);
+                } else {
+                    cellMap.put(null, i);
+                }
+            }
+            // 鏈夋暟鎹椂鎵嶅鐞� 寰楀埌绫荤殑鎵�鏈塮ield.
+            Field[] allFields = clazz.getDeclaredFields();
+            // 瀹氫箟涓�涓猰ap鐢ㄤ簬瀛樻斁鍒楃殑搴忓彿鍜宖ield.
+            Map<Integer, Field> fieldsMap = new HashMap<Integer, Field>();
+            for (int col = 0; col < allFields.length; col++) {
+                Field field = allFields[col];
+                Excel attr = field.getAnnotation(Excel.class);
+                if (attr != null && (attr.type() == Excel.Type.ALL || attr.type() == type)) {
+                    // 璁剧疆绫荤殑绉佹湁瀛楁灞炴�у彲璁块棶.
+                    field.setAccessible(true);
+                    Integer column = cellMap.get(attr.name());
+                    if (column != null) {
+                        fieldsMap.put(column, field);
+                    }
+                }
+            }
+            for (int i = 1; i < rows; i++) {
+                // 浠庣2琛屽紑濮嬪彇鏁版嵁,榛樿绗竴琛屾槸琛ㄥご.
+                Row row = sheet.getRow(i);
+                T entity = null;
+                for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet()) {
+                    Object val = this.getCellValue(row, entry.getKey());
+
+                    // 濡傛灉涓嶅瓨鍦ㄥ疄渚嬪垯鏂板缓.
+                    entity = (entity == null ? clazz.newInstance() : entity);
+                    // 浠巑ap涓緱鍒板搴斿垪鐨刦ield.
+                    Field field = fieldsMap.get(entry.getKey());
+                    // 鍙栧緱绫诲瀷,骞舵牴鎹璞$被鍨嬭缃��.
+                    Class<?> fieldType = field.getType();
+                    if (String.class == fieldType) {
+                        String s = Convert.toStr(val);
+                        if (StringUtils.endsWith(s, ".0")) {
+                            val = StringUtils.substringBefore(s, ".0");
+                        } else {
+                            String dateFormat = field.getAnnotation(Excel.class).dateFormat();
+                            if (StringUtils.isNotEmpty(dateFormat)) {
+                                val = DateUtils.parseDateToStr(dateFormat, (Date) val);
+                            } else {
+                                val = Convert.toStr(val);
+                            }
+                        }
+                    } else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
+                        val = Convert.toInt(val);
+                    } else if (Long.TYPE == fieldType || Long.class == fieldType) {
+                        val = Convert.toLong(val);
+                    } else if (Double.TYPE == fieldType || Double.class == fieldType) {
+                        val = Convert.toDouble(val);
+                    } else if (Float.TYPE == fieldType || Float.class == fieldType) {
+                        val = Convert.toFloat(val);
+                    } else if (BigDecimal.class == fieldType) {
+                        val = Convert.toBigDecimal(val);
+                    } else if (Date.class == fieldType) {
+                        if (val instanceof String) {
+                            val = DateUtils.parseDate(val);
+                        } else if (val instanceof Double) {
+                            val = DateUtil.getJavaDate((Double) val);
+                        }
+                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
+                        val = Convert.toBool(val, false);
+                    }
+                    if (StringUtils.isNotNull(fieldType)) {
+                        Excel attr = field.getAnnotation(Excel.class);
+                        String propertyName = field.getName();
+                        if (StringUtils.isNotEmpty(attr.targetAttr())) {
+                            propertyName = field.getName() + "." + attr.targetAttr();
+                        } else if (StringUtils.isNotEmpty(attr.readConverterExp())) {
+                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
+                        }
+                        ReflectUtils.invokeSetter(entity, propertyName, val);
+                    }
+                }
+                list.add(entity);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
+     *
+     * @param response  杩斿洖鏁版嵁
+     * @param list      瀵煎嚭鏁版嵁闆嗗悎
+     * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
+     * @return 缁撴灉
+     * @throws IOException
+     */
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        this.init(list, sheetName, Excel.Type.EXPORT);
+        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
+     *
+     * @param
+     * @param list     瀵煎嚭鏁版嵁闆嗗悎
+     * @return 缁撴灉
+     * @throws IOException
+     */
+    public void exportExcelManySheet(HttpServletResponse response, List<ExcelExp> list, boolean includeQrCode, byte[] bt,
+                                     List<String> sigArr, List<String> arrAn, String inquiryNumber, String caseTitle) throws IOException {
+      //  response.setContentType("application/vnd.ms-excel");
+      //  response.setCharacterEncoding("utf-8");
+
+        try {
+            createWorkbook();
+            for (int index = 0; index <list.size(); index++) {
+                this.clazz = list.get(index).getClazz();
+                this.init(list.get(index).getDataset(), list.get(index).getFileName(), Excel.Type.EXPORT);
+                // 鍙栧嚭涓�鍏辨湁澶氬皯涓猻heet.
+//                    double sheetNo = Math.ceil(list.size() / sheetSize);
+                createSheetManySheet(index);
+
+                Row row;
+                int firow = 0;
+
+                int column = 0;
+                if(index == 0) {
+                    // 鍚堝苟绗竴琛岀殑鍓�5涓崟鍏冩牸
+                    sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));
+
+
+
+                    // 鍒涘缓琛屽苟璁剧疆楂樺害
+                     row = sheet.createRow(firow);
+                    row.setHeight((short)(40 * 40));
+                    //鐢熸垚浜岀淮鐮�
+                    if(includeQrCode)
+                    {
+                        Cell cell = row.createCell(6);
+
+                        // 璁剧疆鍥剧墖澶у皬鍜屼綅缃�
+                        ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) (cell.getColumnIndex()+1), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() +2),
+                                cell.getRow().getRowNum() + 1);
+                        // 璁$畻灞呬腑浣嶇疆
+//                    int col1 = 0; // 涓棿鍒�
+//                    int col2 = col1 + 2;
+//                    anchor.setCol1(col1);
+//                    anchor.setCol2(col2);
+//                    anchor.setDx1(100);
+//                    anchor.setDy1(0);
+//                    anchor.setDx2(255); // 瀹藉害
+//                    anchor.setDy2(255); // 楂樺害
+                        anchor.setRow1(1);
+                        anchor.setRow2(1);
+                        byte[] data = bt;
+                        anchor.setDx1(2400000);
+                        anchor.setDy1(-10);
+
+                        anchor.setDy2(-800000);
+                        // 鑾峰彇鍥剧墖鍘熷灏哄
+                        BufferedImage image = ImageIO.read(new ByteArrayInputStream(data));
+                        double widthInEMU = image.getWidth() * 9525 * 0.2;
+                        double heightInEMU = image.getHeight() * 9525;
+
+                        // 璁剧疆鍥剧墖鍘熷灏哄
+                        anchor.setDx2(-100000); // 鍘熷瀹藉害
+                        //   anchor.setDy2((int)heightInEMU); // 鍘熷楂樺害
+//anchor.setCol1(5); // 浠庣6鍒楀紑濮嬫樉绀�
+//anchor.setCol2(10); // 鍒扮11鍒楃粨鏉�
+
+                        //Files.readAllBytes(Paths.get(RuoYiConfig.getProfile() + "/upload/2025/08/14/30_20250814212128A031.jpg"));
+//
+//
+//                    System.out.println(data.length);
+                        getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
+                                cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+                        firow = firow + 1;
+                        row = sheet.createRow(firow);
+                    }
+                  //  sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 7));
+                    if(firow==1)
+                    {
+                        sheet.addMergedRegion(new CellRangeAddress(firow, firow, 0, 8));
+                        // 鍒涘缓琛屽苟璁剧疆楂樺害
+                        row.setHeight((short)(20 * 20));
+                    }
+                    Cell titleCell = row.createCell(0);
+                    titleCell.setCellValue("鏂囦欢鏉愭枡绉讳氦鐩綍娓呭崟(鍗峰唴绾�)");
+                    // 璁剧疆鍔犵矖鍜屽眳涓牱寮�
+                    CellStyle style = wb.createCellStyle();
+                    Font font = wb.createFont();
+                    font.setBold(true);
+                    font.setFontName("瀹嬩綋");
+                    style.setFont(font);
+                    style.setAlignment(HorizontalAlignment.CENTER);
+                    titleCell.setCellStyle(style);
+                    firow = firow + 1;
+                    row = sheet.createRow(firow);
+               //
+                    row.createCell(0).setCellValue("鍙戞枃鍙�:");
+                    sheet.addMergedRegion(new CellRangeAddress(firow, firow, 1, 3));
+                    row.createCell(1).setCellValue(inquiryNumber);
+                    row.createCell(4).setCellValue("妗堝嵎棰樺悕:");
+                    sheet.addMergedRegion(new CellRangeAddress(firow, firow, 5, 9));
+
+                    //   row.createCell(4).setCellValue("妗e彿:");
+                    //鎷垮埌妗e彿
+                    row.createCell(5).setCellValue(caseTitle);
+//                    row = sheet.createRow(2);
+//                    row.createCell(0).setCellValue("妗堝嵎棰樺悕:");
+                    firow = firow + 1;
+                    row = sheet.createRow(firow);
+                    System.out.println("++++++++++++++++++++++++++---------++++++++++++");
+                    System.out.println(firow);
+                    column = 0;
+                } else {
+                    // 鏅�歴heet澶勭悊
+                 //   recordId = (DocumentMaterialsVo)list.get(0)
+                    row = sheet.createRow(0);
+                    column = 0;
+                }
+//                // 浜х敓涓�琛�
+
+                // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉�
+                for (Object[] os : fields) {
+                    Excel excel = (Excel) os[1];
+                    this.createCell(excel, row, column++);
+                }
+                if (Excel.Type.EXPORT.equals(type)) {
+                    fillExcelData(index, row, firow);
+                    addStatisticsRow();
+                }
+
+                //鍐欏叆绛惧悕
+                System.out.println(list.get(0).getDataset().size()+"aaaaaaaaaaaaaaaaaaa0999");
+                row = sheet.createRow(list.get(0).getDataset().size()+4);
+                //
+                int in = 0 ;
+                for(int i = 0; i < sigArr.size(); i++) {
+                    row.createCell(in).setCellValue(sigArr.get(i));
+                    in = in + 3;
+                }
+                //鍐欏叆娉ㄩ噴
+                for(int i = 0; i < arrAn.size();i++) {
+                    row = sheet.createRow(list.get(0).getDataset().size() + 5+i);
+                    int ri = list.get(0).getDataset().size() + 5+i;
+                    sheet.addMergedRegion(new CellRangeAddress(ri, ri, 0, 3));
+
+                    row.createCell(0).setCellValue(i+1+"銆�"+arrAn.get(i));
+                }
+
+            }
+            wb.write(response.getOutputStream());
+        } catch (IOException e) {
+            log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
+        } finally {
+            if (wb != null) {
+                try {
+                    wb.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+//            if (response.getOutputStream() != null) {
+//                try {
+//                    response.getOutputStream().close();
+//                } catch (IOException e1) {
+//                    e1.printStackTrace();
+//                }
+//            }
+        }
+//        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
+     *
+     * @param sheetName 宸ヤ綔琛ㄧ殑鍚嶇О
+     * @return 缁撴灉
+     */
+    public void importTemplateExcel(HttpServletResponse response, String sheetName) throws IOException {
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        this.init(null, sheetName, Excel.Type.IMPORT);
+        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
+     *
+     * @return 缁撴灉
+     */
+    public void exportExcel(OutputStream outputStream) {
+        try {
+            // 鍙栧嚭涓�鍏辨湁澶氬皯涓猻heet.
+            double sheetNo = Math.ceil(list.size() / sheetSize);
+            for (int index = 0; index <= sheetNo; index++) {
+                createSheet(sheetNo, index);
+
+                // 浜х敓涓�琛�
+                Row row = sheet.createRow(0);
+                int column = 0;
+                // 鍐欏叆鍚勪釜瀛楁鐨勫垪澶村悕绉�
+                for (Object[] os : fields) {
+                    Excel excel = (Excel) os[1];
+                    this.createCell(excel, row, column++);
+                }
+                if (Excel.Type.EXPORT.equals(type)) {
+                    fillExcelData(index, row, 0);
+                    addStatisticsRow();
+                }
+            }
+            wb.write(outputStream);
+        } catch (Exception e) {
+            log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
+        } finally {
+            if (wb != null) {
+                try {
+                    wb.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 濉厖excel鏁版嵁
+     *
+     * @param index 搴忓彿
+     * @param row   鍗曞厓鏍艰
+     */
+    public void fillExcelData(int index, Row row, int firRow) {
+//        int startNo = index * sheetSize;
+//        int endNo = Math.min(startNo + sheetSize, list.size());
+        for (int i = 0; i < list.size(); i++) {
+            if(index==0)
+                row = sheet.createRow(i + firRow + 1);
+            else
+                row = sheet.createRow(i + 1 );
+            // 寰楀埌瀵煎嚭瀵硅薄.
+            T vo = (T) list.get(i);
+            int column = 0;
+            for (Object[] os : fields) {
+                Field field = (Field) os[0];
+                Excel excel = (Excel) os[1];
+                // 璁剧疆瀹炰綋绫荤鏈夊睘鎬у彲璁块棶
+                field.setAccessible(true);
+                this.addCell(excel, row, vo, field, column++);
+            }
+        }
+    }
+
+    /**
+     * 鍒涘缓琛ㄦ牸鏍峰紡
+     *
+     * @param wb 宸ヤ綔钖勫璞�
+     * @return 鏍峰紡鍒楄〃
+     */
+    private Map<String, CellStyle> createStyles(Workbook wb) {
+        // 鍐欏叆鍚勬潯璁板綍,姣忔潯璁板綍瀵瑰簲excel琛ㄤ腑鐨勪竴琛�
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        CellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderTop(BorderStyle.THIN);
+        style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        Font dataFont = wb.createFont();
+        dataFont.setFontName("Arial");
+        dataFont.setFontHeightInPoints((short) 10);
+        style.setFont(dataFont);
+        styles.put("data", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        Font headerFont = wb.createFont();
+        headerFont.setFontName("Arial");
+        headerFont.setFontHeightInPoints((short) 10);
+        headerFont.setBold(true);
+        headerFont.setColor(IndexedColors.WHITE.getIndex());
+        style.setFont(headerFont);
+        styles.put("header", style);
+
+        style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        Font totalFont = wb.createFont();
+        totalFont.setFontName("Arial");
+        totalFont.setFontHeightInPoints((short) 10);
+        style.setFont(totalFont);
+        styles.put("total", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.LEFT);
+        styles.put("data1", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        styles.put("data2", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.RIGHT);
+        styles.put("data3", style);
+
+        return styles;
+    }
+
+    /**
+     * 鍒涘缓鍗曞厓鏍�
+     */
+    public Cell createCell(Excel attr, Row row, int column) {
+        // 鍒涘缓鍒�
+        Cell cell = row.createCell(column);
+        // 鍐欏叆鍒椾俊鎭�
+        cell.setCellValue(attr.name());
+        setDataValidation(attr, row, column);
+        cell.setCellStyle(styles.get("header"));
+        return cell;
+    }
+
+    /**
+     * 璁剧疆鍗曞厓鏍间俊鎭�
+     *
+     * @param value 鍗曞厓鏍煎��
+     * @param attr  娉ㄨВ鐩稿叧
+     * @param cell  鍗曞厓鏍间俊鎭�
+     */
+    public void setCellVo(Object value, Excel attr, Cell cell) {
+        if (Excel.ColumnType.STRING == attr.cellType()) {
+            cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
+        } else if (Excel.ColumnType.NUMERIC == attr.cellType()) {
+            cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+        } else if (Excel.ColumnType.IMAGE == attr.cellType()) {
+            ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),
+                    cell.getRow().getRowNum() + 1);
+            String imagePath = Convert.toStr(value);
+            if (StringUtils.isNotEmpty(imagePath)) {
+                byte[] data = ImageUtils.getImage(imagePath);
+                getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
+                        cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+            }
+        }
+    }
+
+    /**
+     * 鑾峰彇鐢诲竷
+     */
+    public static Drawing<?> getDrawingPatriarch(Sheet sheet) {
+        if (sheet.getDrawingPatriarch() == null) {
+            sheet.createDrawingPatriarch();
+        }
+        return sheet.getDrawingPatriarch();
+    }
+
+    /**
+     * 鑾峰彇鍥剧墖绫诲瀷,璁剧疆鍥剧墖鎻掑叆绫诲瀷
+     */
+    public int getImageType(byte[] value) {
+        String type = FileTypeUtils.getFileExtendName(value);
+        if ("JPG".equalsIgnoreCase(type)) {
+            return Workbook.PICTURE_TYPE_JPEG;
+        } else if ("PNG".equalsIgnoreCase(type)) {
+            return Workbook.PICTURE_TYPE_PNG;
+        }
+        return Workbook.PICTURE_TYPE_JPEG;
+    }
+
+    /**
+     * 鍒涘缓琛ㄦ牸鏍峰紡
+     */
+    public void setDataValidation(Excel attr, Row row, int column) {
+        if (attr.name().indexOf("娉細") >= 0) {
+            sheet.setColumnWidth(column, 6000);
+        } else {
+            // 璁剧疆鍒楀
+            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
+        }
+        // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�.
+        if (StringUtils.isNotEmpty(attr.prompt())) {
+            // 杩欓噷榛樿璁句簡2-101鍒楁彁绀�.
+            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+        }
+        // 濡傛灉璁剧疆浜哻ombo灞炴�у垯鏈垪鍙兘閫夋嫨涓嶈兘杈撳叆
+        if (attr.combo().length > 0) {
+            // 杩欓噷榛樿璁句簡2-101鍒楀彧鑳介�夋嫨涓嶈兘杈撳叆.
+            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
+        }
+    }
+
+    /**
+     * 娣诲姞鍗曞厓鏍�
+     */
+    public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
+        Cell cell = null;
+        try {
+            // 璁剧疆琛岄珮
+            row.setHeight(maxHeight);
+            // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑�,鏈変簺鎯呭喌闇�瑕佷繚鎸佷负绌�,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒�.
+            if (attr.isExport()) {
+                // 鍒涘缓cell
+                cell = row.createCell(column);
+//                attr.align();
+//                int align = attr.align().value;
+//                cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
+
+                // 鐢ㄤ簬璇诲彇瀵硅薄涓殑灞炴��
+                Object value = getTargetValue(vo, field, attr);
+                String dateFormat = attr.dateFormat();
+                String readConverterExp = attr.readConverterExp();
+                String separator = attr.separator();
+                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
+                } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
+                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
+                } else if (value instanceof BigDecimal && -1 != attr.scale()) {
+                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());
+                } else {
+                    // 璁剧疆鍒楃被鍨�
+                    setCellVo(value, attr, cell);
+                }
+                addStatisticsData(column, Convert.toStr(value), attr);
+            }
+        } catch (Exception e) {
+            log.error("瀵煎嚭Excel澶辫触{}", e);
+        }
+        return cell;
+    }
+
+    /**
+     * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀�
+     *
+     * @param sheet         琛ㄥ崟
+     * @param promptTitle   鎻愮ず鏍囬
+     * @param promptContent 鎻愮ず鍐呭
+     * @param firstRow      寮�濮嬭
+     * @param endRow        缁撴潫琛�
+     * @param firstCol      寮�濮嬪垪
+     * @param endCol        缁撴潫鍒�
+     */
+    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
+                              int firstCol, int endCol) {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        dataValidation.createPromptBox(promptTitle, promptContent);
+        dataValidation.setShowPromptBox(true);
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 璁剧疆鏌愪簺鍒楃殑鍊煎彧鑳借緭鍏ラ鍒剁殑鏁版嵁,鏄剧ず涓嬫媺妗�.
+     *
+     * @param sheet    瑕佽缃殑sheet.
+     * @param textlist 涓嬫媺妗嗘樉绀虹殑鍐呭
+     * @param firstRow 寮�濮嬭
+     * @param endRow   缁撴潫琛�
+     * @param firstCol 寮�濮嬪垪
+     * @param endCol   缁撴潫鍒�
+     * @return 璁剧疆濂界殑sheet.
+     */
+    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        // 鍔犺浇涓嬫媺鍒楄〃鍐呭
+        DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
+        // 璁剧疆鏁版嵁鏈夋晥鎬у姞杞藉湪鍝釜鍗曞厓鏍间笂,鍥涗釜鍙傛暟鍒嗗埆鏄細璧峰琛屻�佺粓姝㈣銆佽捣濮嬪垪銆佺粓姝㈠垪
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        // 鏁版嵁鏈夋晥鎬у璞�
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        // 澶勭悊Excel鍏煎鎬ч棶棰�
+        if (dataValidation instanceof XSSFDataValidation) {
+            dataValidation.setSuppressDropDownArrow(true);
+            dataValidation.setShowErrorBox(true);
+        } else {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 瑙f瀽瀵煎嚭鍊� 0=鐢�,1=濂�,2=鏈煡
+     *
+     * @param propertyValue 鍙傛暟鍊�
+     * @param converterExp  缈昏瘧娉ㄨВ
+     * @param separator     鍒嗛殧绗�
+     * @return 瑙f瀽鍚庡��
+     */
+    public static String convertByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(separator, propertyValue)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[0].equals(value)) {
+                        propertyString.append(itemArray[1] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[0].equals(propertyValue)) {
+                    return itemArray[1];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 鍙嶅悜瑙f瀽鍊� 鐢�=0,濂�=1,鏈煡=2
+     *
+     * @param propertyValue 鍙傛暟鍊�
+     * @param converterExp  缈昏瘧娉ㄨВ
+     * @param separator     鍒嗛殧绗�
+     * @return 瑙f瀽鍚庡��
+     */
+    public static String reverseByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(separator, propertyValue)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[1].equals(value)) {
+                        propertyString.append(itemArray[0] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[1].equals(propertyValue)) {
+                    return itemArray[0];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 鍚堣缁熻淇℃伅
+     */
+    private void addStatisticsData(Integer index, String text, Excel entity) {
+        if (entity != null && entity.isStatistics()) {
+            Double temp = 0D;
+            if (!statistics.containsKey(index)) {
+                statistics.put(index, temp);
+            }
+            try {
+                temp = Double.valueOf(text);
+            } catch (NumberFormatException e) {
+            }
+            statistics.put(index, statistics.get(index) + temp);
+        }
+    }
+
+    /**
+     * 鍒涘缓缁熻琛�
+     */
+    public void addStatisticsRow() {
+        if (statistics.size() > 0) {
+            Cell cell = null;
+            Row row = sheet.createRow(sheet.getLastRowNum() + 1);
+            Set<Integer> keys = statistics.keySet();
+            cell = row.createCell(0);
+            cell.setCellStyle(styles.get("total"));
+            cell.setCellValue("鍚堣");
+
+            for (Integer key : keys) {
+                cell = row.createCell(key);
+                cell.setCellStyle(styles.get("total"));
+                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
+            }
+            statistics.clear();
+        }
+    }
+
+    /**
+     * 鑾峰彇bean涓殑灞炴�у��
+     *
+     * @param vo    瀹炰綋瀵硅薄
+     * @param field 瀛楁
+     * @param excel 娉ㄨВ
+     * @return 鏈�缁堢殑灞炴�у��
+     * @throws Exception
+     */
+    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception {
+        Object o = field.get(vo);
+        if (StringUtils.isNotEmpty(excel.targetAttr())) {
+            String target = excel.targetAttr();
+            if (target.indexOf(".") > -1) {
+                String[] targets = target.split("[.]");
+                for (String name : targets) {
+                    o = getValue(o, name);
+                }
+            } else {
+                o = getValue(o, target);
+            }
+        }
+        return o;
+    }
+
+    /**
+     * 浠ョ被鐨勫睘鎬х殑get鏂规硶鏂规硶褰㈠紡鑾峰彇鍊�
+     *
+     * @param o
+     * @param name
+     * @return value
+     * @throws Exception
+     */
+    private Object getValue(Object o, String name) throws Exception {
+        if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name)) {
+            Class<?> clazz = o.getClass();
+            Field field = clazz.getDeclaredField(name);
+            field.setAccessible(true);
+            o = field.get(o);
+        }
+        return o;
+    }
+
+    /**
+     * 寰楀埌鎵�鏈夊畾涔夊瓧娈�
+     */
+    private void createExcelField() {
+        this.fields = new ArrayList<Object[]>();
+        List<Field> tempFields = new ArrayList<>();
+        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
+        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
+        for (Field field : tempFields) {
+            // 鍗曟敞瑙�
+            if (field.isAnnotationPresent(Excel.class)) {
+                putToField(field, field.getAnnotation(Excel.class));
+            }
+
+            // 澶氭敞瑙�
+            if (field.isAnnotationPresent(Excels.class)) {
+                Excels attrs = field.getAnnotation(Excels.class);
+                Excel[] excels = attrs.value();
+                for (Excel excel : excels) {
+                    putToField(field, excel);
+                }
+            }
+        }
+        this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
+        this.maxHeight = getRowHeight();
+    }
+
+    /**
+     * 鏍规嵁娉ㄨВ鑾峰彇鏈�澶ц楂�
+     */
+    public short getRowHeight() {
+        double maxHeight = 0;
+        for (Object[] os : this.fields) {
+            Excel excel = (Excel) os[1];
+            maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
+        }
+        return (short) (maxHeight * 20);
+    }
+
+    /**
+     * 鏀惧埌瀛楁闆嗗悎涓�
+     */
+    private void putToField(Field field, Excel attr) {
+        if (attr != null && (attr.type() == Excel.Type.ALL || attr.type() == type)) {
+            this.fields.add(new Object[]{field, attr});
+        }
+    }
+
+    /**
+     * 鍒涘缓涓�涓伐浣滅翱
+     */
+    public void createWorkbook() {
+        this.wb = new SXSSFWorkbook(500);
+    }
+
+    /**
+     * 鍒涘缓宸ヤ綔琛�
+     *
+     * @param sheetNo sheet鏁伴噺
+     * @param index   搴忓彿
+     */
+    public void createSheet(double sheetNo, int index) {
+        this.sheet = wb.createSheet();
+        this.styles = createStyles(wb);
+        // 璁剧疆宸ヤ綔琛ㄧ殑鍚嶇О.
+        if (sheetNo == 0) {
+            wb.setSheetName(index, sheetName);
+        } else {
+            wb.setSheetName(index, sheetName + index);
+        }
+    }
+    /**
+     * 鍒涘缓宸ヤ綔琛�
+     *
+     * @param index   搴忓彿
+     */
+    public void createSheetManySheet( int index) {
+        this.sheet = wb.createSheet();
+        this.styles = createStyles(wb);
+        wb.setSheetName(index, sheetName);
+    }
+    /**
+     * 鑾峰彇鍗曞厓鏍煎��
+     *
+     * @param row    鑾峰彇鐨勮
+     * @param column 鑾峰彇鍗曞厓鏍煎垪鍙�
+     * @return 鍗曞厓鏍煎��
+     */
+    public Object getCellValue(Row row, int column) {
+        if (row == null) {
+            return row;
+        }
+        Object val = "";
+        try {
+            Cell cell = row.getCell(column);
+            if (StringUtils.isNotNull(cell)) {
+                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) {
+                    val = cell.getNumericCellValue();
+                    if (DateUtil.isCellDateFormatted(cell)) {
+                        val = DateUtil.getJavaDate((Double) val); // POI Excel 鏃ユ湡鏍煎紡杞崲
+                    } else {
+                        if ((Double) val % 1 != 0) {
+                            val = new BigDecimal(val.toString());
+                        } else {
+                            val = new DecimalFormat("0").format(val);
+                        }
+                    }
+                } else if (cell.getCellType() == CellType.STRING) {
+                    val = cell.getStringCellValue();
+                } else if (cell.getCellType() == CellType.BOOLEAN) {
+                    val = cell.getBooleanCellValue();
+                } else if (cell.getCellType() == CellType.ERROR) {
+                    val = cell.getErrorCellValue();
+                }
+
+            }
+        } catch (Exception e) {
+            return val;
+        }
+        return val;
+    }
+}

--
Gitblit v1.9.1