From f1cd8eda0e1995b5d350e4cc6c13facead1b3f07 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 05 一月 2026 22:19:29 +0800
Subject: [PATCH] 修改了对应代码

---
 archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java          |   18 
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFour.java        |  115 +++-
 archiveManager/src/main/java/com/ruoyi/domain/dto/searSigAnn.java                        |    3 
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFive.java        | 1163 ++++++++++++++++++++++++++++++++++++++++++++++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveRecordsController.java |  142 +++--
 5 files changed, 1,343 insertions(+), 98 deletions(-)

diff --git a/archiveManager/src/main/java/com/ruoyi/domain/dto/searSigAnn.java b/archiveManager/src/main/java/com/ruoyi/domain/dto/searSigAnn.java
index ebaa946..e27974e 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/dto/searSigAnn.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/dto/searSigAnn.java
@@ -9,4 +9,7 @@
     private Long recordId;
 
     private Boolean includeQrCode;
+
+
+    private String menu;
 }
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java
index c8ace84..36b1be6 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/vo/DocumentMaterialsFileList.java
@@ -18,27 +18,27 @@
     private String inquiryNumber;
 
     private String caseTitle;
-    @Excel(name="搴忓彿", headerColor = IndexedColors.BLACK)
+    @Excel(name="搴忓彿", width = 7.89, headerColor = IndexedColors.BLACK)
     private Long num;
-    @Excel(name = "鏂囦欢缂栧彿", headerColor = IndexedColors.BLACK)
+    @Excel(name = "鏂囧彿                锛堝嵎鍐呮枃浠跺彿锛�", width = 16.89,headerColor = IndexedColors.BLACK)
     private String documentNumber;
 
-    @Excel(name = "鏂囦欢棰樺悕", headerColor = IndexedColors.BLACK)
+    @Excel(name = "鏂囦欢棰樺悕",width = 39.22, headerColor = IndexedColors.BLACK)
     private String title;
 
 
-    @Excel(name = "椤靛彿", headerColor = IndexedColors.BLACK)
+    @Excel(name = "椤靛彿",width = 10.33, headerColor = IndexedColors.BLACK)
     private Long pageNumber;
 
-    @Excel(name = "鏄惁鏈夊叾浠栦粙璐�", headerColor = IndexedColors.BLACK)
+    @Excel(name = "鏄惁鏈夊叾浠栦粙璐�", width = 10.11, headerColor = IndexedColors.BLACK)
     private String fileStyle1;
 
-    @Excel(name = "鏂囦欢绫诲瀷", headerColor = IndexedColors.BLACK)
+    @Excel(name = "鏂囦欢绫诲瀷", width = 11.22, headerColor = IndexedColors.BLACK)
     private String fileStyle;
-    @Excel(name = "淇濈鏈熼檺", headerColor = IndexedColors.BLACK)
+    @Excel(name = "淇濈鏈熼檺", width = 8.67, headerColor = IndexedColors.BLACK)
     private String retentionPeriod;
-    @Excel(name = "鍏紑灞炴��", headerColor = IndexedColors.BLACK)
+    @Excel(name = "鍏紑灞炴��",width = 10.11, headerColor = IndexedColors.BLACK)
     private String publicity;
-    @Excel(name = "澶囨敞", headerColor = IndexedColors.BLACK)
+    @Excel(name = "澶囨敞", width = 11.67, headerColor = IndexedColors.BLACK)
     private String remarks;
 }
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 ead5dca..caaf3c0 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
@@ -48,8 +48,7 @@
  */
 @RestController
 @RequestMapping("/system/records")
-public class ArchiveRecordsController extends BaseController
-{
+public class ArchiveRecordsController extends BaseController {
     @Autowired
     private IArchiveRecordsService archiveRecordsService;
     @Autowired
@@ -60,13 +59,13 @@
 
     @Autowired
     private IDocumentMaterialsService iDocumentMaterialsService;
+
     /**
      * 鏌ヨ妗f瀹屾垚鎯呭喌
      */
     @PreAuthorize("@ss.hasPermi('system:records:list')")
     @GetMapping("/analysisRes")
-    public AjaxResult analysis()
-    {
+    public AjaxResult analysis() {
         System.out.println("009099");
         return new AjaxResult(200, "鏌ヨ鎴愬姛", archiveRecordsService.statisticAya());
     }
@@ -74,8 +73,7 @@
     @PreAuthorize("@ss.hasPermi('system:records:export')")
     @Log(title = "妗f鍒嗘瀽缁撴灉瀵煎嚭", businessType = BusinessType.EXPORT)
     @PostMapping("/exportAllStatis")
-    public void exportAllStatis(HttpServletResponse response)
-    {
+    public void exportAllStatis(HttpServletResponse response) {
         List<AnalysisResult> list = archiveRecordsService.statisticAya();
         ExcelUtil<AnalysisResult> util = new ExcelUtil<AnalysisResult>(AnalysisResult.class);
         util.exportExcel(response, list, "妗堝嵎鐩綍");
@@ -86,31 +84,30 @@
      */
     @PreAuthorize("@ss.hasPermi('system:records:list')")
     @GetMapping("/list")
-    public AjaxResult list(ArchiveRecords archiveRecords)
-    {
+    public AjaxResult list(ArchiveRecords archiveRecords) {
 
         Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
         Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
         return archiveRecordsService.selectDataList(archiveRecords, pageNum, pageSize);
 
     }
+
     /**
      * 鎷垮埌鏈�澶d
      */
     @PreAuthorize("@ss.hasPermi('system:records:list')")
     @GetMapping("/getMaxId")
-    public AjaxResult getMaxId()
-    {
-        return success(archiveRecordsService.getMaxId()+1);
+    public AjaxResult getMaxId() {
+        return success(archiveRecordsService.getMaxId() + 1);
     }
+
     /**
      * 瀵煎嚭妗f璁板綍鍒楄〃
      */
     @PreAuthorize("@ss.hasPermi('system:records:export')")
     @Log(title = "妗f璁板綍", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ArchiveRecords archiveRecords, @RequestParam(value = "ids", required = false) Long[] ids)
-    {
+    public void export(HttpServletResponse response, ArchiveRecords archiveRecords, @RequestParam(value = "ids", required = false) Long[] ids) {
         List<ArchiveRecords> list;
         System.out.println(ids);
         // 濡傛灉鎻愪緵浜唅ds鍙傛暟锛屽垯鏍规嵁ids瀵煎嚭鎸囧畾璁板綍
@@ -129,11 +126,10 @@
      */
     @PreAuthorize("@ss.hasPermi('system:records:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
 
         ArchiveRecords records = archiveRecordsService.selectArchiveRecordsById(id);
-        if(records!=null)
+        if (records != null)
             return new AjaxResult(200, "鏌ヨ鎴愬姛", records);
         else
             return new AjaxResult(201, "鏌ヨ澶辫触锛�");
@@ -145,16 +141,14 @@
     @PreAuthorize("@ss.hasPermi('system:records:add')")
     @Log(title = "妗f璁板綍", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ArchiveRecords archiveRecords)
-    {
+    public AjaxResult add(@RequestBody ArchiveRecords archiveRecords) {
         int res = archiveRecordsService.insertArchiveRecords(archiveRecords);
         System.out.println(res);
-        if(res==0) {
+        if (res == 0) {
             System.out.println(res);
 
             return new AjaxResult(0, "妗f鍙峰凡缁忓瓨鍦ㄤ簡锛�");
-        }
-        else
+        } else
             return new AjaxResult(200, "娣诲姞鎴愬姛浜嗭紒");
 
 
@@ -166,34 +160,33 @@
     @PreAuthorize("@ss.hasPermi('system:records:edit')")
     @Log(title = "妗f璁板綍", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ArchiveRecords archiveRecords)
-    {
+    public AjaxResult edit(@RequestBody ArchiveRecords archiveRecords) {
         return toAjax(archiveRecordsService.updateArchiveRecords(archiveRecords));
     }
+
     @PreAuthorize("@ss.hasPermi('system:records:edit')")
     @Log(title = "妗f璁板綍", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/updateSByIds")
-    public AjaxResult updateStatusByIds(@RequestBody Long[] ids)
-    {
+    public AjaxResult updateStatusByIds(@RequestBody Long[] ids) {
         System.out.println(ids);
         System.out.println("090sdfsdf");
-        return new AjaxResult(0, archiveRecordsService.updateStatusByIds(ids)+"");
+        return new AjaxResult(0, archiveRecordsService.updateStatusByIds(ids) + "");
     }
+
     /**
      * 鍒犻櫎妗f璁板綍
      */
     @PreAuthorize("@ss.hasPermi('system:records:remove')")
     @Log(title = "妗f璁板綍", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(archiveRecordsService.deleteArchiveRecordsByIds(ids));
     }
+
     @PreAuthorize("@ss.hasPermi('system:records:edit')")
     @Log(title = "妗f璁板綍瀵煎叆", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
-    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
-    {
+    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {
         return archiveRecordsService.importExcel(file);
     }
 
@@ -201,34 +194,31 @@
     @PreAuthorize("@ss.hasPermi('system:records:edit')")
     @Log(title = "淇敼鐘舵��", businessType = BusinessType.IMPORT)
     @GetMapping(value = "/updateStatusById/{status}/{id}")
-    public AjaxResult updateStatusById(@PathVariable("status") String status,@PathVariable("id") String id)
-    {
-        return new AjaxResult(200, archiveRecordsService.updateArchiveById(status, Long.parseLong(id))+"");
+    public AjaxResult updateStatusById(@PathVariable("status") String status, @PathVariable("id") String id) {
+        return new AjaxResult(200, archiveRecordsService.updateArchiveById(status, Long.parseLong(id)) + "");
     }
 
 
-
     @PostMapping("/model")
-    public void getExportModel(HttpServletResponse response){
+    public void getExportModel(HttpServletResponse response) {
         List<ArchiveRecordModelExp> list = Collections.singletonList(new ArchiveRecordModelExp());
         ExcelUtil<ArchiveRecordModelExp> util = new ExcelUtil<>(ArchiveRecordModelExp.class);
-        util.exportExcel(response,list,"妗f淇℃伅瀵煎叆妯℃澘");
+        util.exportExcel(response, list, "妗f淇℃伅瀵煎叆妯℃澘");
     }
 
 
     @PostMapping("/modelOther")
-    public void getExportModelOther(HttpServletResponse response){
+    public void getExportModelOther(HttpServletResponse response) {
         List<ArchiveRecordModelOther> list = Collections.singletonList(new ArchiveRecordModelOther());
         ExcelUtil<ArchiveRecordModelOther> util = new ExcelUtil<>(ArchiveRecordModelOther.class);
-        util.exportExcel(response,list,"妗f淇℃伅瀵煎叆妯℃澘");
+        util.exportExcel(response, list, "妗f淇℃伅瀵煎叆妯℃澘");
     }
 
     @PreAuthorize("@ss.hasPermi('system:records:list')")
     @Log(title = "鏄惁鍏佽鎻愪氦", businessType = BusinessType.IMPORT)
     @GetMapping(value = "/whether/{recordId}")
-    public AjaxResult whether(@PathVariable("recordId") Long recordId)
-    {
-        return AjaxResult.success( archiveRecordsService.whether(recordId));
+    public AjaxResult whether(@PathVariable("recordId") Long recordId) {
+        return AjaxResult.success(archiveRecordsService.whether(recordId));
     }
 
     @PostMapping("/recordFileList")
@@ -238,63 +228,93 @@
         //System.out.println(includeQrCode);
         //鐢熸垚浜岀淮鐮�
         String code = "2024050000029250";
-        byte [] bt = barcodeService.generateBarcodeImage(code);
-      //  System.out.println(Arrays.toString(selectedSignatures));
+        byte[] bt = barcodeService.generateBarcodeImage(code);
+        //  System.out.println(Arrays.toString(selectedSignatures));
         //绛惧悕閫夋嫨
-        String [] sig = {"涓氬姟绉戝绉讳氦浜�:","瀹℃壒绉戠Щ浜や汉:","妗f鏁寸悊鍏徃:"};
+        String[] sig = {"涓氬姟绉戝绉讳氦浜�:", "瀹℃壒绉戠Щ浜や汉:", "妗f鏁寸悊鍏徃:"};
         List<String> arrLis = new ArrayList<>();
-        if(searSigAnn.getSelectedSignatures()!=null){
-            for(String si: searSigAnn.getSelectedSignatures())
-            {
+        if (searSigAnn.getSelectedSignatures() != null) {
+            for (String si : searSigAnn.getSelectedSignatures()) {
                 arrLis.add(sig[Integer.parseInt(si)]);
+                System.out.println(sig[Integer.parseInt(si)]);
             }
         }
         //娉ㄩ�夋嫨
-        String [] ann = { "鏈竻鍗曠敱妗f褰㈡垚閮ㄩ棬瀹屾垚",
+        String[] ann = {"鏈竻鍗曠敱妗f褰㈡垚閮ㄩ棬瀹屾垚",
                 "鏂囦欢绫诲瀷蹇呴』褰曞叆锛屽寘鎷粨璁烘潗鏂欍�佽繃绋嬫潗鏂欍�佺敵璇锋潗鏂欙紝鍏朵粬鏉愭枡",
                 "鍏紑灞炴�у繀椤诲綍鍏ワ紝涓诲姩鍏紑銆佷緷鐢宠鍏紑銆佸厤浜堝叕寮�",
                 "淇濈鏈熼檺:30骞存垨姘镐箙",
                 "椤靛彿鎸夌収姝e紡褰曞叆椤电爜涓哄噯"};
         List<String> arrAn = new ArrayList<>();
-        if(searSigAnn.getSelectedAnnotations()!=null) {
-            for (String ar : searSigAnn.getSelectedAnnotations()) {
-                arrAn.add(ann[Integer.parseInt(ar)]);
-            }
+        // 1. 瀵圭储寮曡繘琛屾帓搴忥紙浠庡皬鍒板ぇ锛�
+        int[] sortedIndices = convertToIntArray(searSigAnn.getSelectedAnnotations()).clone();
+        Arrays.sort(sortedIndices);
+     //   String[] result = new String[sortedIndices.length];
+        for (int sortedIndex : sortedIndices) {
+            arrAn.add(ann[sortedIndex]);
         }
+
+
+
         List<DocumentMaterialsFileList> arsi = new ArrayList<>();
 //        DocumentMaterials documentMaterials = new DocumentMaterials();
 //        documentMaterials.setRecordId(recordId);
         List<DocumentMaterialsFileList> lst = iDocumentMaterialsService.selectDocumentMaterialsFileList(searSigAnn.getRecordId());
 
 
-
         // 澶嶅埗灞炴�у埌SmallObject鍒楄〃
         for (DocumentMaterialsFileList bigObject : lst) {
             DocumentMaterialsFileList smallObject = new DocumentMaterialsFileList();
             BeanUtil.copyProperties(bigObject, smallObject); // 澶嶅埗灞炴��
+            System.out.println(bigObject);
+            if(bigObject.getFileStyle()!=null&&
+                    ((bigObject.getFileStyle().equals("鍏跺畠鏉愭枡"))
+                    ||bigObject.getFileStyle().equals("鍏夌洏")
+                            ||bigObject.getFileStyle().equals("U鐩�")))
+                smallObject.setFileStyle1("鏄�");
+            else
+                smallObject.setFileStyle1("鍚�");
             arsi.add(smallObject);
         }
-
-      //  arsi.add(aIV);
-        ExcelExp e3 = new ExcelExp("鏂囦欢鏉愭枡绉讳氦鐩綍娓呭崟",arsi, DocumentMaterialsFileList.class);
-       // ExcelExp e4 = new ExcelExp("妗堝嵎灏侀潰",  arsi, recordId1, imgr1,sedcode, ArchiveInfoVo.class);
+       // System.out.println(arsi.toString());
+        //  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);
+        // mysheet1.add(e4);
         //ByteOutputStream bos2 = new ByteOutputStream();
+        //  if(searSigAnn.getMenu().equals(""))
         ExcelUtilManySheetFour<List<ExcelExp>> util3 = new ExcelUtilManySheetFour<List<ExcelExp>>(mysheet1);
 
 
         //鎷垮埌caseTitle鍜宨nquiryNumber
         String inquiryNumber = "";
         String caseTitle = "";
-        if(!arsi.isEmpty())
-        {
+        if (!arsi.isEmpty()) {
             inquiryNumber = arsi.get(0).getInquiryNumber();
             caseTitle = arsi.get(0).getCaseTitle();
         }
         util3.exportExcelManySheet(response, mysheet1, searSigAnn.getIncludeQrCode(), bt, arrLis, arrAn, inquiryNumber, caseTitle);
     }
+
+
+    public static int[] convertToIntArray(String[] source) {
+        int[] result = new int[source.length];
+
+        for (int i = 0; i < source.length; i++) {
+            try {
+                result[i] = Integer.parseInt(source[i].trim());
+            } catch (NumberFormatException e) {
+                System.out.println("閿欒: 绱㈠紩 " + i + " 鐨勫�� '" +
+                        source[i] + "' 涓嶆槸鏈夋晥鏁存暟");
+                result[i] = 0; // 鎴栬�呬娇鐢ㄩ粯璁ゅ��
+            }
+        }
+
+        return result;
+    }
+
 }
 
 
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFive.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFive.java
new file mode 100644
index 0000000..ed3c17c
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetFive.java
@@ -0,0 +1,1163 @@
+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.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+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 ExcelUtilManySheetFive<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 ExcelUtilManySheetFive(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.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        // 璁剧疆鏂囦欢鍚�
+        String fileName = UUID.randomUUID() + "_"  + ".xlsx";
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+        this.init(list, sheetName, Excel.Type.EXPORT);
+        exportExcel(response.getOutputStream());
+    }
+
+    /**
+     * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
+     *
+     * @param
+     * @param list     瀵煎嚭鏁版嵁闆嗗悎
+     * @return 缁撴灉
+     * @throws IOException
+     */
+    /**
+     * 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
+     *
+     * @param response  杩斿洖鏁版嵁
+     * @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.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        // 璁剧疆鏂囦欢鍚�
+        String fileName = UUID.randomUUID() + "_" + ".xlsx";
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+
+        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));
+
+                    // 蹇呴』鍏堣缃负true
+                    // 椤甸潰甯冨眬璁剧疆
+                    sheet.setAutobreaks(true);
+                    sheet.setFitToPage(true);
+
+                    // 鑾峰彇鎵撳嵃璁剧疆
+                    PrintSetup printSetup = sheet.getPrintSetup();
+
+                    // 璁剧疆涓�1椤靛搴�
+                    printSetup.setFitWidth((short) 1);   // 瀹藉害璋冩暣涓�1椤�
+                    printSetup.setFitHeight((short) 0);  // 楂樺害涓嶉檺鍒�
+
+                    // 鍏朵粬鎵撳嵃璁剧疆
+                    printSetup.setPaperSize(PrintSetup.A4_PAPERSIZE);  // A4绾�
+                    printSetup.setLandscape(false);  // 绾靛悜鎵撳嵃
+
+
+                    // 鍒涘缓琛屽苟璁剧疆楂樺害
+                     row = sheet.createRow(firow);
+                    //鐢熸垚浜岀淮鐮�
+                    if(includeQrCode)
+                    {
+                        row.setHeight((short)(40 * 40));
+
+                        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.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
+                        // 璁$畻灞呬腑浣嶇疆
+                        int col1 = 3; // 涓棿鍒�
+                        int col2 = col1 + 3;
+                        anchor.setCol1(col1);
+                        anchor.setCol2(col2);
+                        anchor.setRow1(0);
+                        anchor.setRow2(1);
+                        byte[] data = bt;
+                 
+                        // 鑾峰彇鍥剧墖鍘熷灏哄
+                        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);
+                    }
+                    else
+                        row.setHeight((short)(20 * 20));
+
+                    //  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);
+                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    titleCell.setCellStyle(style);
+                    firow = firow + 1;
+                    row = sheet.createRow(firow);
+                    // 灏嗗浐瀹氳楂樻敼涓鸿嚜鍔ㄨ楂橈紝浠ヤ究鍐呭鑳藉畬鏁存樉绀哄湪鍚堝苟鍖哄煙
+                    row.setHeight((short)(50*20));
+                    //
+                    CellStyle style1 = wb.createCellStyle();
+                    style1.setAlignment(HorizontalAlignment.LEFT);
+                    style1.setVerticalAlignment(VerticalAlignment.CENTER);
+                    style1.setWrapText(true);
+                    Cell cell2 = row.createCell(0);
+                    cell2.setCellValue("鍙戞枃鍙�:");
+                    cell2.setCellStyle(style1);
+                    
+                    // 鍚堝苟绗�1-3鍒�
+                    int startCol1 = 1;
+                    int endCol1 = 3;
+                    sheet.addMergedRegion(new CellRangeAddress(firow, firow, startCol1, endCol1));
+                    
+                    // 璁剧疆鎵�鏈夊悎骞跺崟鍏冩牸鐨勬牱寮�
+                    for (int col = startCol1; col <= endCol1; col++) {
+                        Cell mergedCell = row.createCell(col);
+                        mergedCell.setCellStyle(style1);
+                    }
+                    
+                    // 鍙湪璧峰鍗曞厓鏍艰缃暟鎹�
+                    Cell inquiryCell = row.getCell(startCol1);
+                    inquiryCell.setCellValue(inquiryNumber);
+                    Cell cell1 = row.createCell(4);
+                    cell1.setCellValue("妗堝嵎棰樺悕:");
+                    cell1.setCellStyle(style1);
+                    
+                    // 鍒涘缓涓�涓柊鐨勬牱寮忕敤浜庢鍗烽鍚嶅悎骞跺崟鍏冩牸
+                    CellStyle mergedCellStyle = wb.createCellStyle();
+                    mergedCellStyle.cloneStyleFrom(style1); // 缁ф壙鍘熸湁鏍峰紡
+                    mergedCellStyle.setAlignment(HorizontalAlignment.LEFT); // 鏀逛负宸﹀榻�
+                    mergedCellStyle.setWrapText(true); // 鍚敤鑷姩鎹㈣
+                    //mergedCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 鍨傜洿灞呬腑
+                    
+                    // 鍚堝苟绗�5-8鍒�
+                    int startCol = 5;
+                    int endCol = 8;
+                    
+                    // 鍏堝垱寤烘墍鏈夐渶瑕佺殑鍗曞厓鏍煎苟璁剧疆鏍峰紡
+                    for (int col = startCol; col <= endCol; col++) {
+                        Cell mergedCell = row.createCell(col);
+                        mergedCell.setCellStyle(mergedCellStyle);
+                    }
+                    
+                    // 鐒跺悗鎵ц鍚堝苟鎿嶄綔
+                    sheet.addMergedRegion(new CellRangeAddress(firow, firow, startCol, endCol));
+
+                    // 鍙湪璧峰鍗曞厓鏍艰缃暟鎹�
+                    Cell getCas = row.getCell(startCol);
+                    getCas.setCellStyle(mergedCellStyle);
+                    getCas.setCellValue(caseTitle);
+                    // 鍙湪璧峰鍗曞厓鏍艰缃暟鎹�
+                    //ces.setCellValue(caseTitle);
+
+                    // 璁剧疆鑷姩鎹㈣
+//                    row = sheet.createRow(2);
+//                    row.createCell(0).setCellValue("妗堝嵎棰樺悕:");
+
+
+
+                    // 璁剧疆鑷姩鎹㈣
+//                    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.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        // 璁剧疆鏂囦欢鍚�
+        String fileName = UUID.randomUUID() + "_"  + ".xlsx";
+        response.setHeader("Content-Disposition", "attachment; filename=" );
+        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.setWrapText(true);
+        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);
+
+        // 鍒涘缓琛ㄥご鏍峰紡鏄犲皠锛屾牴鎹瓻xcel娉ㄨВ鍔ㄦ�佺敓鎴�
+        Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();
+        for (Object[] os : fields)
+        {
+            Excel excel = (Excel) os[1];
+            String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());
+            if (!headerStyles.containsKey(key))
+            {
+                 style = wb.createCellStyle();
+                style.cloneStyleFrom(styles.get("data"));
+                style.setAlignment(HorizontalAlignment.CENTER);
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
+                // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+                style.setWrapText(true);
+                // 鏍规嵁娉ㄨВ璁剧疆琛ㄥご鑳屾櫙鑹� - 宸叉敞閲婏紝琛ㄥご涓嶆樉绀鸿儗鏅壊
+                /*if (excel.headerBackgroundColor() != IndexedColors.WHITE) {
+                    style.setFillForegroundColor(excel.headerBackgroundColor().index);
+                    style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+                }*/
+                Font headerFont = wb.createFont();
+                headerFont.setFontName("Arial");
+                headerFont.setFontHeightInPoints((short) 10);
+                headerFont.setBold(false);
+                headerFont.setColor(excel.headerColor().index);
+                style.setFont(headerFont);
+                headerStyles.put(key, style);
+            }
+        }
+        styles.putAll(headerStyles);
+
+        style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
+        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);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
+        styles.put("data1", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
+        styles.put("data2", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.RIGHT);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
+        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);
+        // 鏍规嵁Excel娉ㄨВ鍔ㄦ�侀�夋嫨琛ㄥご鏍峰紡
+        String key = StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor());
+        cell.setCellStyle(styles.get(key));
+        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鍒楁彁绀�.
+            setCellPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+        }
+        // 濡傛灉璁剧疆浜哻ombo灞炴�у垯鏈垪鍙兘閫夋嫨涓嶈兘杈撳叆
+        if (attr.combo().length > 0) {
+            // 杩欓噷榛樿璁句簡2-101鍒楀彧鑳介�夋嫨涓嶈兘杈撳叆.
+            setCellValidation(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((short) -1);
+            // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑�,鏈変簺鎯呭喌闇�瑕佷繚鎸佷负绌�,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒�.
+            if (attr.isExport()) {
+                // 鍒涘缓cell
+                cell = row.createCell(column);
+                // 璁剧疆鍗曞厓鏍兼牱寮�
+                HorizontalAlignment align = attr.align();
+                String styleKey = "data";
+                if (align == HorizontalAlignment.LEFT) {
+                    styleKey = "data1";
+                } else if (align == HorizontalAlignment.CENTER) {
+                    styleKey = "data2";
+                } else if (align == HorizontalAlignment.RIGHT) {
+                    styleKey = "data3";
+                }
+                cell.setCellStyle(styles.get(styleKey));
+
+                // 鐢ㄤ簬璇诲彇瀵硅薄涓殑灞炴��
+                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;
+    }
+
+    /**
+     * 璁剧疆鍗曞厓鏍兼彁绀�
+     *
+     * @param sheet         琛ㄥ崟
+     * @param promptTitle   鎻愮ず鏍囬
+     * @param promptContent 鎻愮ず鍐呭
+     * @param firstRow      寮�濮嬭
+     * @param endRow        缁撴潫琛�
+     * @param firstCol      寮�濮嬪垪
+     * @param endCol        缁撴潫鍒�
+     */
+    public void setCellPrompt(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 setCellValidation(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(false);
+            dataValidation.setShowErrorBox(true);
+        }
+
+        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 XSSFWorkbook();
+    }
+
+    /**
+     * 鍒涘缓宸ヤ綔琛�
+     *
+     * @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;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
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
index 4c5a8de..20cfed5 100644
--- 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
@@ -331,7 +331,7 @@
                     //鐢熸垚浜岀淮鐮�
                     if(includeQrCode)
                     {
-                        row.setHeight((short)(40 * 40));
+                        row.setHeight((short)(55.8 * 20));
 
                         Cell cell = row.createCell(6);
                         // 璁剧疆鍥剧墖澶у皬鍜屼綅缃�
@@ -348,7 +348,7 @@
 //                    anchor.setDy2(255); // 楂樺害
                         anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
                         // 璁$畻灞呬腑浣嶇疆
-                        int col1 = 3; // 涓棿鍒�
+                        int col1 = 4; // 涓棿鍒�
                         int col2 = col1 + 3;
                         anchor.setCol1(col1);
                         anchor.setCol2(col2);
@@ -377,14 +377,14 @@
                         row = sheet.createRow(firow);
                     }
                     else
-                        row.setHeight((short)(20 * 20));
+                        row.setHeight((short)(33 * 20));
 
                     //  sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 7));
                     if(firow==1)
                     {
                         sheet.addMergedRegion(new CellRangeAddress(firow, firow, 0, 8));
                         // 鍒涘缓琛屽苟璁剧疆楂樺害
-                        row.setHeight((short)(20 * 20));
+                        row.setHeight((short)(33 * 20));
                     }
                     Cell titleCell = row.createCell(0);
                     titleCell.setCellValue("鏂囦欢鏉愭枡绉讳氦鐩綍娓呭崟(鍗峰唴绾�)");
@@ -392,62 +392,86 @@
                     CellStyle style = wb.createCellStyle();
                     Font font = wb.createFont();
                     font.setBold(true);
+                    font.setFontHeightInPoints((short) 18);
+
                     font.setFontName("瀹嬩綋");
                     style.setFont(font);
+                    style.setVerticalAlignment(VerticalAlignment.CENTER);
                     style.setAlignment(HorizontalAlignment.CENTER);
                     titleCell.setCellStyle(style);
                     firow = firow + 1;
                     row = sheet.createRow(firow);
+
                     // 灏嗗浐瀹氳楂樻敼涓鸿嚜鍔ㄨ楂橈紝浠ヤ究鍐呭鑳藉畬鏁存樉绀哄湪鍚堝苟鍖哄煙
-                    row.setHeight((short)(50*20));
+                    row.setHeight((short)(27.6*20));
                     //
                     CellStyle style1 = wb.createCellStyle();
-                    style1.setAlignment(HorizontalAlignment.LEFT);
+                    style1.setAlignment(HorizontalAlignment.RIGHT);
+                    style1.setVerticalAlignment(VerticalAlignment.TOP);
+                    Font font1 = wb.createFont();
+                    font1.setBold(true);
+                    font1.setFontHeightInPoints((short) 12);
+
+                    font1.setFontName("瀹嬩綋");
+                    style1.setFont(font1);
                     Cell cell2 = row.createCell(0);
                     cell2.setCellValue("鍙戞枃鍙�:");
                     cell2.setCellStyle(style1);
-                    
+
                     // 鍚堝苟绗�1-3鍒�
                     int startCol1 = 1;
-                    int endCol1 = 3;
+                    int endCol1 = 2;
                     sheet.addMergedRegion(new CellRangeAddress(firow, firow, startCol1, endCol1));
-                    
+
                     // 璁剧疆鎵�鏈夊悎骞跺崟鍏冩牸鐨勬牱寮�
                     for (int col = startCol1; col <= endCol1; col++) {
                         Cell mergedCell = row.createCell(col);
                         mergedCell.setCellStyle(style1);
                     }
-                    
+
                     // 鍙湪璧峰鍗曞厓鏍艰缃暟鎹�
+                    CellStyle style2 = wb.createCellStyle();
+                    style2.setAlignment(HorizontalAlignment.LEFT);
+                    style2.setVerticalAlignment(VerticalAlignment.TOP);
+                    Font font2 = wb.createFont();
+
+                    font2.setFontHeightInPoints((short) 11);
+
+                    font2.setFontName("瀹嬩綋");
+                    style2.setFont(font2);
                     Cell inquiryCell = row.getCell(startCol1);
+                    inquiryCell.setCellStyle(style2);
                     inquiryCell.setCellValue(inquiryNumber);
-                    Cell cell1 = row.createCell(4);
+                    Cell cell1 = row.createCell(3);
                     cell1.setCellValue("妗堝嵎棰樺悕:");
                     cell1.setCellStyle(style1);
-                    
+
                     // 鍒涘缓涓�涓柊鐨勬牱寮忕敤浜庢鍗烽鍚嶅悎骞跺崟鍏冩牸
                     CellStyle mergedCellStyle = wb.createCellStyle();
                     mergedCellStyle.cloneStyleFrom(style1); // 缁ф壙鍘熸湁鏍峰紡
                     mergedCellStyle.setAlignment(HorizontalAlignment.LEFT); // 鏀逛负宸﹀榻�
                     mergedCellStyle.setWrapText(true); // 鍚敤鑷姩鎹㈣
                     //mergedCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); // 鍨傜洿灞呬腑
-                    
+
                     // 鍚堝苟绗�5-8鍒�
-                    int startCol = 5;
+                    int startCol = 4;
                     int endCol = 8;
-                    
+
                     // 鍏堝垱寤烘墍鏈夐渶瑕佺殑鍗曞厓鏍煎苟璁剧疆鏍峰紡
                     for (int col = startCol; col <= endCol; col++) {
                         Cell mergedCell = row.createCell(col);
                         mergedCell.setCellStyle(mergedCellStyle);
                     }
-                    
+
                     // 鐒跺悗鎵ц鍚堝苟鎿嶄綔
                     sheet.addMergedRegion(new CellRangeAddress(firow, firow, startCol, endCol));
 
                     // 鍙湪璧峰鍗曞厓鏍艰缃暟鎹�
                     Cell getCas = row.getCell(startCol);
-                    getCas.setCellStyle(mergedCellStyle);
+
+                    style2.setWrapText(true); // 鍚敤鑷姩鎹㈣
+
+                    getCas.setCellStyle(style2);
                     getCas.setCellValue(caseTitle);
                     // 鍙湪璧峰鍗曞厓鏍艰缃暟鎹�
                     //ces.setCellValue(caseTitle);
@@ -463,6 +487,11 @@
 //                    row.createCell(0).setCellValue("妗堝嵎棰樺悕:");
                     firow = firow + 1;
                     row = sheet.createRow(firow);
+
+
+
+                    // 璁剧疆琛ㄥご楂樺害涓�43.2
+                    row.setHeight((short)(43.2*20));
                     System.out.println("++++++++++++++++++++++++++---------++++++++++++");
                     System.out.println(firow);
                     column = 0;
@@ -470,6 +499,8 @@
                     // 鏅�歴heet澶勭悊
                  //   recordId = (DocumentMaterialsVo)list.get(0)
                     row = sheet.createRow(0);
+                    // 璁剧疆琛ㄥご楂樺害涓�43.2
+                    row.setHeight((short)(43.2*20));
                     column = 0;
                 }
 //                // 浜х敓涓�琛�
@@ -487,19 +518,46 @@
                 //鍐欏叆绛惧悕
                 System.out.println(list.get(0).getDataset().size()+"aaaaaaaaaaaaaaaaaaa0999");
                 row = sheet.createRow(list.get(0).getDataset().size()+4);
+                row = sheet.createRow(list.get(0).getDataset().size()+5);
+
                 //
+                                    CellStyle style4 = wb.createCellStyle();
+
+                    Font font4 = wb.createFont();
+                    font4.setBold(true);
+                    font4.setFontHeightInPoints((short) 12);
+
+                    font4.setFontName("瀹嬩綋");
+                    style4.setFont(font4);
+
+
                 int in = 0 ;
-                for(int i = 0; i < sigArr.size(); i++) {
-                    row.createCell(in).setCellValue(sigArr.get(i));
-                    in = in + 3;
+                for (String s : sigArr) {
+                    Cell clr = row.createCell(in);
+
+
+                    System.out.println(s);
+                    clr.setCellStyle(style4);
+                    clr.setCellValue(s);
+
+                    in = in + 2;
                 }
+                System.out.println(in);
+
+            //    row = sheet.createRow(0);
+               // row = sheet.createRow(list.get(0).getDataset().size() + 7);
+
                 //鍐欏叆娉ㄩ噴
                 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;
+                   // System.out.println(arrAn.get(i));
+                    row = sheet.createRow(list.get(0).getDataset().size() + 7+i);
+                    int ri = list.get(0).getDataset().size() + 7+i;
                     sheet.addMergedRegion(new CellRangeAddress(ri, ri, 0, 3));
+                    if(i==0)
+                        row.createCell(0).setCellValue("娉�:    "+(i+1)+"銆�"+arrAn.get(i));
+                    else
+                        row.createCell(0).setCellValue("       "+(i+1)+"銆�"+arrAn.get(i));
 
-                    row.createCell(0).setCellValue(i+1+"銆�"+arrAn.get(i));
                 }
 
             }
@@ -637,7 +695,7 @@
         style.setBorderBottom(BorderStyle.THIN);
         style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
         Font dataFont = wb.createFont();
-        dataFont.setFontName("Arial");
+        dataFont.setFontName("瀹嬩綋");
         dataFont.setFontHeightInPoints((short) 10);
         style.setFont(dataFont);
         styles.put("data", style);
@@ -662,9 +720,9 @@
                     style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
                 }*/
                 Font headerFont = wb.createFont();
-                headerFont.setFontName("Arial");
-                headerFont.setFontHeightInPoints((short) 10);
-                headerFont.setBold(false);
+                headerFont.setFontName("瀹嬩綋");
+                headerFont.setFontHeightInPoints((short) 11);
+                headerFont.setBold(true);
                 headerFont.setColor(excel.headerColor().index);
                 style.setFont(headerFont);
                 headerStyles.put(key, style);
@@ -678,7 +736,7 @@
         // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
         style.setWrapText(true);
         Font totalFont = wb.createFont();
-        totalFont.setFontName("Arial");
+        totalFont.setFontName("瀹嬩綋");
         totalFont.setFontHeightInPoints((short) 10);
         style.setFont(totalFont);
         styles.put("total", style);
@@ -1163,3 +1221,4 @@
 
 
 
+

--
Gitblit v1.9.1