Merge branch 'master_0929' into master_after20

 package com.lframework.xingyun.sc.controller.customer;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.lframework.starter.bpm.dto.FlowTaskDto;
 import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
@@ -24,6 +27,7 @@ import com.lframework.starter.web.core.components.resp.InvokeResult;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotBlank;
+import com.lframework.xingyun.sc.excel.customerCredit.AutoColumnWidthHandler;
 import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportListener;
 import com.lframework.xingyun.sc.excel.customerCredit.CustomerCreditImportModel;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
@@ -51,6 +55,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.io.*;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -293,8 +298,47 @@ public class CustomerCreditController extends DefaultBaseController {
     @ApiOperation("下载导入模板")
     @HasPermission({"customer-credit-manage:customer-credit-plan:import"})
     @GetMapping("/import/template")
-    public void downloadImportTemplate() {
-        ExcelUtil.exportXls("客户资信导入模板", CustomerCreditImportModel.class);
+    public void downloadImportTemplate(HttpServletResponse response) throws IOException {
+        String fileName = "客户资信导入模板.xlsx";
+
+        //设置响应头
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+
+        String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString()).replace("+", "%20");
+        String contentDisposition = "attachment; filename=\"" + encodedFileName + "\"; filename*=UTF-8''" + encodedFileName;
+        response.setHeader("Content-Disposition", contentDisposition);
+
+
+        List<List<String>> noteRows = Arrays.asList(
+                Collections.singletonList("【重要填写说明】"),
+                Collections.singletonList("1. 带*是必填项"),
+                Collections.singletonList("2. 办事处要是全称：例如 北方办事处"),
+                Collections.singletonList("3. 区域要是全称：例如 山东区域"),
+                Collections.singletonList("4. 企业类型只能是：经销商、终端"),
+                Collections.singletonList("5. 注册资本格式：100 或 100万元"),
+                Collections.singletonList("6. 登记日期、注册时间格式：2025年3月21日 或 2025-03-21 或 2025/3/21"),
+                Collections.singletonList("7. 年龄格式：正整数，不要带单位 例如 25"),
+                Collections.singletonList("8. 性别格式：男 或 女"),
+                Collections.singletonList("9. 员工人数格式：正整数，不要带单位 例如 25"),
+                Collections.singletonList("10. 建议客户分类格式：只能为：AAA、AA、A、BBB、BB、B、C、D")
+        );
+
+        try (OutputStream out = response.getOutputStream()) {
+            ExcelWriter excelWriter = EasyExcel.write(out).build();
+
+            // ✅ 注册自定义 handler，仅用于数据 sheet
+            WriteSheet dataSheet = EasyExcel.writerSheet("客户资信导入")
+                    .head(CustomerCreditImportModel.class)
+                    .registerWriteHandler(new AutoColumnWidthHandler())
+                    .build();
+            excelWriter.write(Collections.emptyList(), dataSheet);
+
+            // “填写说明” sheet 不需要样式，不注册 handler
+            WriteSheet noteSheet = EasyExcel.writerSheet("填写说明").build();
+            excelWriter.write(noteRows, noteSheet);
+
+            excelWriter.finish();
+        }
     }
 
     @ApiOperation("导入")

+package com.lframework.xingyun.sc.excel.customerCredit;
+
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+
+import java.util.List;
+
+/**
+ * 仅用于在导出 Excel 模板时自动调整表头列宽
+ */
+public class AutoColumnWidthHandler implements CellWriteHandler {
+
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+                                 org.apache.poi.ss.usermodel.Row row, Head head, Integer columnIndex,
+                                 Integer relativeRowIndex, Boolean isHead) {
+        // 不处理
+    }
+
+    @Override
+    public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+                                Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+        // 不处理
+    }
+
+    @Override
+    public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+
+    }
+
+    @Override
+    public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+        if (Boolean.TRUE.equals(isHead) && head != null && head.getHeadNameList() != null) {
+            String headName = head.getHeadNameList().get(0).replaceAll("[\\n\\r\\t]", "").trim();
+            Sheet sheet = cell.getSheet();
+            int columnIndex = cell.getColumnIndex();
+
+            int width = calculateColumnWidth(headName);
+            // 限制最大宽度（例如最多 50 个字符），避免过宽
+            sheet.setColumnWidth(columnIndex, Math.min(width * 256, 50 * 256));
+        }
+
+    }
+
+    private int calculateColumnWidth(String text) {
+        int width = 0;
+        for (char c : text.toCharArray()) {
+            if (Character.isWhitespace(c)) {
+                width += 1;
+            } else if (c >= '\u4e00' && c <= '\u9fff') { // 中文
+                width += 2;
+            } else {
+                width += 1;
+            }
+        }
+        // 增加额外宽度（防止拥挤）
+        return (int) Math.max(width * 2, 12); // 乘以1.5，并最小12
+    }
+}

@@ -27,14 +27,14 @@ public class CustomerCreditImportModel implements ExcelModel {
    * 编号
    */
   @ExcelRequired
-  @ExcelProperty("编号")
+  @ExcelProperty("*编号")
   private String code;
 
   /**
    * 办事处
    */
   @ExcelRequired
-  @ExcelProperty("办事处")
+  @ExcelProperty("*办事处")
   private String deptName;
 
   /**
@@ -47,7 +47,7 @@ public class CustomerCreditImportModel implements ExcelModel {
    * 区域
    */
   @ExcelRequired
-  @ExcelProperty("区域")
+  @ExcelProperty("*区域")
   private String regionName;
 
   /**
@@ -60,14 +60,14 @@ public class CustomerCreditImportModel implements ExcelModel {
    * 简写名称
    */
   @ExcelRequired
-  @ExcelProperty("简写名称")
+  @ExcelProperty("*简写名称")
   private String customerShortName;
 
   /**
    * 登记日期
    */
   @ExcelRequired
-  @ExcelProperty("登记日期")
+  @ExcelProperty("*登记日期")
   private String registerDateStr;
 
   /**
@@ -80,7 +80,7 @@ public class CustomerCreditImportModel implements ExcelModel {
    * 公司名称
    */
   @ExcelRequired
-  @ExcelProperty("公司名称")
+  @ExcelProperty("*公司名称")
   private String name;
 
   /**
@@ -93,7 +93,7 @@ public class CustomerCreditImportModel implements ExcelModel {
    * 企业类型
    */
   @ExcelRequired
-  @ExcelProperty("企业类型")
+  @ExcelProperty("*企业类型")
   private String enterpriseType;
 
   /**
@@ -414,7 +414,7 @@ public class CustomerCreditImportModel implements ExcelModel {
    * 结算期限
    */
   @ExcelRequired
-  @ExcelProperty("结算期限")
+  @ExcelProperty("*结算期限")
   private String settlementPeriod;
 
   /**
@@ -433,7 +433,7 @@ public class CustomerCreditImportModel implements ExcelModel {
    * 授信额度
    */
   @ExcelRequired
-  @ExcelProperty("授信额度")
+  @ExcelProperty("*授信额度")
   private String creditLimit;
 
   /**