创建Excel解析时间格式的工具类，创建解析数字类型的工具类,并根据测试不断修改代码

src/main/java/com/example/backend/BackendApplication.java

@@ -3,9 +3,11 @@ package com.example.backend;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 @MapperScan({"com.example.backend.mapper", "com.example.backend.mapper.contract"})
+// 确保扫描整个包
 public class BackendApplication {
 
     public static void main(String[] args) {

src/main/java/com/example/backend/controller/contract/SalesContractController.java

@@ -13,7 +13,7 @@ import java.util.Map;
  * 销售合同控制器
  */
 @RestController
-@RequestMapping("/api/contract")
+@RequestMapping("/salesContract")
 public class SalesContractController {
 
     @Autowired

src/main/java/com/example/backend/entity/contract/SalesContractEntity.java

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.*;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 
 
 /**
@@ -30,7 +30,7 @@ public class SalesContractEntity {
 
     // 单据日期
     @TableField("fdate")
-    private LocalDateTime fdate;
+    private Date fdate;
 
     // 销售合同号
     @TableField("sono")
@@ -54,7 +54,7 @@ public class SalesContractEntity {
 
     // 签约日期
     @TableField("signDate")
-    private LocalDateTime signDate;
+    private Date signDate;
 
     // 代理协议号
     @TableField("agentNo")
@@ -66,15 +66,15 @@ public class SalesContractEntity {
 
     // 合同起始有效期
     @TableField("contrStart")
-    private LocalDateTime contrStart;
+    private Date contrStart;
 
     // 合同截止有效期
     @TableField("contrEnd")
-    private LocalDateTime contrEnd;
+    private Date contrEnd;
 
     // 销售交货日期
     @TableField("sDelivDt")
-    private LocalDateTime sDelivDt;
+    private Date sDelivDt;
 
     // 合同描述
     @TableField("contrDesc")
@@ -246,7 +246,7 @@ public class SalesContractEntity {
 
     // 客户履约保证金支付日期
     @TableField("ctPerfPayDt")
-    private LocalDateTime ctPerfPayDt;
+    private Date ctPerfPayDt;
 
     // 客户履约保证金比例
     @TableField("ctPerfRatio")
@@ -254,7 +254,7 @@ public class SalesContractEntity {
 
     // 合同完结付款日期
     @TableField("contrFinalPayDt")
-    private LocalDateTime contrFinalPayDt;
+    private Date contrFinalPayDt;
 
     // 合同违约金比例
     @TableField("contrPenaltyRatio")
@@ -362,7 +362,7 @@ public class SalesContractEntity {
 
     // 合同变更日期
     @TableField("changeDate")
-    private LocalDateTime changeDate;
+    private Date changeDate;
 
     // 变更协议号
     @TableField("changeAgreementNo")
@@ -450,7 +450,7 @@ public class SalesContractEntity {
 
     // 创建时间
     @TableField("create_time")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     // 创建人
     @TableField("create_by_name")
@@ -462,7 +462,7 @@ public class SalesContractEntity {
 
     // 更新时间
     @TableField("update_time")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     // 更新人
     @TableField("update_by_name")
@@ -530,11 +530,11 @@ public class SalesContractEntity {
 
     // 签约日期
     @TableField("signDt")
-    private LocalDateTime signDt;
+    private Date signDt;
 
     // 合同生效日期
     @TableField("validDate")
-    private LocalDateTime validDate;
+    private Date validDate;
 
     // 合同执行人机构代码
     @TableField("contrExecCdInstitutionId")
@@ -598,7 +598,7 @@ public class SalesContractEntity {
 
     // 变更时间
     @TableField("curChangeTime")
-    private LocalDateTime curChangeTime;
+    private Date curChangeTime;
 
     // 变更人
     @TableField("curChangeUser")
@@ -686,11 +686,11 @@ public class SalesContractEntity {
 
     // 最迟装运日期
     @TableField("estLoadDt")
-    private LocalDateTime estLoadDt;
+    private Date estLoadDt;
 
     // 最迟集港日期
     @TableField("estArrDt")
-    private LocalDateTime estArrDt;
+    private Date estArrDt;
 
     // 合同借壳评审人
     @TableField("reviewer")
@@ -710,11 +710,11 @@ public class SalesContractEntity {
 
     // 提交审批日期
     @TableField("submissionDate")
-    private LocalDateTime submissionDate;
+    private Date submissionDate;
 
     // 审批生效日期
     @TableField("appEffectiveDate")
-    private LocalDateTime appEffectiveDate;
+    private Date appEffectiveDate;
 
     // 保供合同一键三联类型
     @TableField("oneClickSourcetype")

src/main/java/com/example/backend/excel/DateUtils.java

@@ -0,0 +1,95 @@
+package com.example.backend.excel;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DateUtils {
+
+    private static final List<DateTimeFormatter> FORMATTERS = new ArrayList<>();
+
+    static {
+        FORMATTERS.add(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        FORMATTERS.add(DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss"));
+        FORMATTERS.add(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        FORMATTERS.add(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
+        FORMATTERS.add(DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH时mm分ss秒"));
+        FORMATTERS.add(DateTimeFormatter.ofPattern("yyyy年MM月dd日"));
+        FORMATTERS.add(DateTimeFormatter.ofPattern("dd/MM/yyyy"));
+        FORMATTERS.add(DateTimeFormatter.ofPattern("dd-MM-yyyy"));
+        FORMATTERS.add(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+        FORMATTERS.add(DateTimeFormatter.ISO_LOCAL_DATE);
+    }
+
+    /**
+     * 将字符串转换为 LocalDateTime
+     */
+    public static LocalDateTime parseToLocalDateTime(String dateStr) {
+        if (dateStr == null || dateStr.trim().isEmpty()) {
+            return null;
+        }
+
+        String trimmedStr = dateStr.trim();
+
+        // 尝试所有格式
+        for (DateTimeFormatter formatter : FORMATTERS) {
+            try {
+                return LocalDateTime.parse(trimmedStr, formatter);
+            } catch (DateTimeParseException e) {
+                // 继续尝试下一个格式
+            }
+        }
+
+        System.err.println("无法解析日期字符串: " + dateStr);
+        return null;
+    }
+
+    /**
+     * 将字符串直接转换为 Date
+     */
+    public static Date parseToDate(String dateStr) {
+        if (dateStr == null || dateStr.trim().isEmpty()) {
+            return null;
+        }
+
+        String trimmedStr = dateStr.trim();
+
+        // 尝试所有格式
+        for (DateTimeFormatter formatter : FORMATTERS) {
+            try {
+                LocalDateTime localDateTime = LocalDateTime.parse(trimmedStr, formatter);
+                return java.sql.Timestamp.valueOf(localDateTime);
+            } catch (DateTimeParseException e) {
+                // 继续尝试下一个格式
+            }
+        }
+
+        System.err.println("无法解析日期字符串: " + dateStr);
+        return null;
+    }
+
+    /**
+     * 将 LocalDateTime 转换为 Date
+     */
+    public static Date toDate(LocalDateTime localDateTime) {
+        if (localDateTime == null) {
+            return null;
+        }
+        return java.sql.Timestamp.valueOf(localDateTime);
+    }
+
+    /**
+     * 将 Date 转换为 LocalDateTime
+     */
+    public static LocalDateTime toLocalDateTime(Date date) {
+        if (date == null) {
+            return null;
+        }
+        return date.toInstant()
+                .atZone(java.time.ZoneId.systemDefault())
+                .toLocalDateTime();
+    }
+}

src/main/java/com/example/backend/excel/ExcelUtil.java

@@ -0,0 +1,206 @@
+package com.example.backend.excel;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Excel解析工具类 - 销售合同专用
+ */
+public class ExcelUtil {
+
+    /**
+     * 读取Excel主表数据 - Sheet1
+     */
+    public static List<SalesContractExcelDTO> readMainSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<SalesContractExcelDTO> listener = new SimpleDataListener<>();
+        EasyExcel.read(file.getInputStream(), SalesContractExcelDTO.class, listener)
+                .sheet() // 不指定sheet名称，读取第一个sheet
+                .headRowNumber(2) // 跳过前2行，从第3行开始读取（索引从0开始）
+                .doRead();
+
+        List<SalesContractExcelDTO> dataList = listener.getDataList();
+        System.out.println("主表读取到 " + dataList.size() + " 条数据");
+
+        // 打印表头信息用于调试
+        if (!dataList.isEmpty()) {
+            SalesContractExcelDTO firstRow = dataList.get(0);
+            System.out.println("=== 第一行数据详情 ===");
+            System.out.println("销售合同号: " + firstRow.getSono());
+            System.out.println("制单人代码: " + firstRow.getCreateBy());
+            System.out.println("业务类型: " + firstRow.getServiceType());
+            System.out.println("合同类型: " + firstRow.getBizType());
+            System.out.println("合同产品类型: " + firstRow.getBizProductType());
+            System.out.println("最迟集港日期: " + firstRow.getEstArrDt());
+            System.out.println("最迟装运日期: " + firstRow.getEstLoadDt());
+            System.out.println("预计客商占款天数: " + firstRow.getOutstandingDay());
+            // 可以根据需要打印更多字段...
+        }
+
+        return dataList;
+    }
+
+    /**
+     * 读取产品明细sheet - Sheet2
+     */
+    public static List<SalesDtlExcelDTO> readSalesDtlSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<SalesDtlExcelDTO> listener = new SimpleDataListener<>();
+        EasyExcel.read(file.getInputStream(), SalesDtlExcelDTO.class, listener)
+                .sheet(1) // 第二个sheet（索引从0开始）
+                .headRowNumber(2) // 跳过前2行
+                .doRead();
+        System.out.println("产品明细读取到 " + listener.getDataList().size() + " 条数据");
+        return listener.getDataList();
+    }
+
+    /**
+     * 读取收款计划sheet - Sheet3
+     */
+    public static List<SalesCollectExcelDTO> readSalesCollectSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<SalesCollectExcelDTO> listener = new SimpleDataListener<>();
+        EasyExcel.read(file.getInputStream(), SalesCollectExcelDTO.class, listener)
+                .sheet(2) // 第三个sheet
+                .headRowNumber(2) // 跳过前2行
+                .doRead();
+        System.out.println("收款计划读取到 " + listener.getDataList().size() + " 条数据");
+        return listener.getDataList();
+    }
+
+    /**
+     * 读取责任中心sheet - Sheet4
+     */
+    public static List<RCenterDtlExcelDTO> readRCenterDtlSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<RCenterDtlExcelDTO> listener = new SimpleDataListener<>();
+        EasyExcel.read(file.getInputStream(), RCenterDtlExcelDTO.class, listener)
+                .sheet(3) // 第四个sheet
+                .headRowNumber(2) // 跳过前2行
+                .doRead();
+        System.out.println("责任中心读取到 " + listener.getDataList().size() + " 条数据");
+        return listener.getDataList();
+    }
+
+    /**
+     * 读取费用明细sheet - Sheet5
+     */
+    public static List<FeeDtlExcelDTO> readFeelDtlSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<FeeDtlExcelDTO> listener = new SimpleDataListener<>();
+        EasyExcel.read(file.getInputStream(), FeeDtlExcelDTO.class, listener)
+                .sheet(4) // 第五个sheet
+                .headRowNumber(2) // 跳过前2行
+                .doRead();
+        System.out.println("费用明细读取到 " + listener.getDataList().size() + " 条数据");
+        return listener.getDataList();
+    }
+
+    /**
+     * 读取服务费率sheet - Sheet6
+     */
+    public static List<ExpSvcRateExcelDTO> readExpSvcRateSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<ExpSvcRateExcelDTO> listener = new SimpleDataListener<>();
+        EasyExcel.read(file.getInputStream(), ExpSvcRateExcelDTO.class, listener)
+                .sheet(5) // 第六个sheet
+                .headRowNumber(2) // 跳过前2行
+                .doRead();
+        System.out.println("服务费率读取到 " + listener.getDataList().size() + " 条数据");
+        return listener.getDataList();
+    }
+
+    /**
+     * 调试方法：打印所有sheet的结构信息
+     */
+    public static void debugExcelStructure(MultipartFile file) throws IOException {
+        System.out.println("=== Excel结构调试信息 ===");
+
+        EasyExcel.read(file.getInputStream(), new AnalysisEventListener<Object>() {
+            private int rowCount = 0;
+
+            @Override
+            public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+                String sheetName = context.readSheetHolder().getSheetName();
+                int sheetNo = context.readSheetHolder().getSheetNo();
+                System.out.println("Sheet" + sheetNo + " [" + sheetName + "] - 表头信息:");
+                headMap.forEach((index, name) -> {
+                    System.out.println("  列" + index + ": " + name);
+                });
+            }
+
+            @Override
+            public void invoke(Object data, AnalysisContext context) {
+                rowCount++;
+                if (rowCount <= 3) { // 只打印前3行数据
+                    System.out.println("Sheet: " + context.readSheetHolder().getSheetName() +
+                            " - 第" + rowCount + "行: " + data);
+                }
+            }
+
+            @Override
+            public void doAfterAllAnalysed(AnalysisContext context) {
+                System.out.println("Sheet: " + context.readSheetHolder().getSheetName() +
+                        " 总行数: " + rowCount);
+                rowCount = 0; // 重置行计数
+            }
+        }).doReadAll();
+    }
+
+    /**
+     * 获取Excel中所有Sheet的名称（用于调试）
+     */
+    public static List<String> getSheetNames(MultipartFile file) throws IOException {
+        List<String> sheetNames = new ArrayList<>();
+        EasyExcel.read(file.getInputStream(), new AnalysisEventListener<Object>() {
+            @Override
+            public void invoke(Object data, AnalysisContext context) {
+                // 不处理数据，只获取sheet名称
+            }
+
+            @Override
+            public void doAfterAllAnalysed(AnalysisContext context) {
+                // 完成分析
+            }
+
+            @Override
+            public void invokeHead(Map<Integer, ReadCellData<?>> headMap, AnalysisContext context) {
+                String sheetName = context.readSheetHolder().getSheetName();
+                if (!sheetNames.contains(sheetName)) {
+                    sheetNames.add(sheetName);
+                    System.out.println("发现Sheet: " + sheetName);
+                }
+            }
+        }).doReadAll();
+
+        return sheetNames;
+    }
+
+    /**
+     * 简单的数据监听器
+     */
+    private static class SimpleDataListener<T> extends AnalysisEventListener<T> {
+        private final List<T> dataList = new ArrayList<>();
+
+        @Override
+        public void invoke(T data, AnalysisContext context) {
+            dataList.add(data);
+            // 打印第一行数据用于调试
+            if (dataList.size() == 1) {
+                System.out.println("第一行数据示例: " + data.toString());
+            }
+        }
+
+        @Override
+        public void doAfterAllAnalysed(AnalysisContext context) {
+            // 所有数据解析完成
+        }
+
+        public List<T> getDataList() {
+            return dataList;
+        }
+    }
+}

src/main/java/com/example/backend/excel/ExcelUtils.java

@@ -76,6 +76,7 @@ public class ExcelUtils {
         SimpleDataListener<SalesContractExcelDTO> listener = new SimpleDataListener<SalesContractExcelDTO>();
         EasyExcel.read(file.getInputStream(), SalesContractExcelDTO.class, listener)
                 .sheet(0) // 第一个sheet
+                .headRowNumber(1) // 从第二行开始读取（跳过标题行）
                 .doRead();
         return listener.getDataList();
     }
@@ -137,58 +138,52 @@ public class ExcelUtils {
     }
 
 
-    /**
-     *读取合同产品明细sheet
-     */
+    // 产品明细Sheet
     public static List<SalesDtlExcelDTO> readSalesDtlSheet(MultipartFile file) throws IOException {
         SimpleDataListener<SalesDtlExcelDTO> listener = new SimpleDataListener<SalesDtlExcelDTO>();
         EasyExcel.read(file.getInputStream(), SalesDtlExcelDTO.class, listener)
-                .sheet(5) // 第六个sheet
+                .sheet(1) // 第二个sheet
+                .headRowNumber(1) // 从第二行开始读取
                 .doRead();
         return listener.getDataList();
     }
 
-    /**
-     *读取收款计划sheet
-     */
+    // 收款计划Sheet
     public static List<SalesCollectExcelDTO> readSalesCollectSheet(MultipartFile file) throws IOException {
         SimpleDataListener<SalesCollectExcelDTO> listener = new SimpleDataListener<SalesCollectExcelDTO>();
         EasyExcel.read(file.getInputStream(), SalesCollectExcelDTO.class, listener)
-                .sheet(5) // 第六个sheet
+                .sheet(2) // 第三个sheet
+                .headRowNumber(1) // 从第二行开始读取
                 .doRead();
         return listener.getDataList();
     }
 
-
-    /**
-     *读取责任中心sheet
-     */
+    // 责任中心Sheet
     public static List<RCenterDtlExcelDTO> readRCenterDtlSheet(MultipartFile file) throws IOException {
         SimpleDataListener<RCenterDtlExcelDTO> listener = new SimpleDataListener<RCenterDtlExcelDTO>();
         EasyExcel.read(file.getInputStream(), RCenterDtlExcelDTO.class, listener)
-                .sheet(5) // 第六个sheet
+                .sheet(3) // 第四个sheet
+                .headRowNumber(1) // 从第二行开始读取
                 .doRead();
         return listener.getDataList();
     }
 
-    /**
-     *读取费用明细sheet
-     */
+    // 费用明细Sheet
     public static List<FeeDtlExcelDTO> readFeelDtlSheet(MultipartFile file) throws IOException {
         SimpleDataListener<FeeDtlExcelDTO> listener = new SimpleDataListener<FeeDtlExcelDTO>();
         EasyExcel.read(file.getInputStream(), FeeDtlExcelDTO.class, listener)
-                .sheet(5) // 第六个sheet
+                .sheet(4) // 第五个sheet
+                .headRowNumber(1) // 从第二行开始读取
                 .doRead();
         return listener.getDataList();
     }
 
-    /**
-     *读取服务费率sheet
-     */
+    // 服务费率Sheet
     public static List<ExpSvcRateExcelDTO> readExpSvcRateSheet(MultipartFile file) throws IOException {
         SimpleDataListener<ExpSvcRateExcelDTO> listener = new SimpleDataListener<ExpSvcRateExcelDTO>();
         EasyExcel.read(file.getInputStream(), ExpSvcRateExcelDTO.class, listener)
                 .sheet(5) // 第六个sheet
+                .headRowNumber(1) // 从第二行开始读取
                 .doRead();
         return listener.getDataList();
     }

src/main/java/com/example/backend/excel/LocalDateTimeConverter.java

@@ -0,0 +1,67 @@
+package com.example.backend.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.converters.ReadConverterContext;
+import com.alibaba.excel.converters.WriteConverterContext;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+@Service
+public class LocalDateTimeConverter implements Converter<LocalDateTime> {
+    
+    private static final DateTimeFormatter FORMatter = 
+        DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public LocalDateTime convertToJavaData(ReadConverterContext<?> context) throws Exception {
+        // 处理数字格式的日期（Excel日期存储为数字）
+        if (context.getReadCellData().getType() == CellDataTypeEnum.NUMBER) {
+            Date date = org.apache.poi.ss.usermodel.DateUtil
+                .getJavaDate(context.getReadCellData().getNumberValue().doubleValue());
+            return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault());
+        }
+        
+        // 处理字符串格式的日期
+        String stringValue = context.getReadCellData().getStringValue();
+        if (stringValue == null || stringValue.trim().isEmpty()) {
+            return null;
+        }
+        
+        try {
+            // 根据你的Excel实际日期格式调整
+            return LocalDateTime.parse(stringValue, FORMatter);
+        } catch (Exception e) {
+            // 如果解析失败，尝试其他格式
+            try {
+                DateTimeFormatter alternativeFormatter = 
+                    DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+                return LocalDateTime.parse(stringValue, alternativeFormatter);
+            } catch (Exception ex) {
+                throw new RuntimeException("日期格式解析失败: " + stringValue, ex);
+            }
+        }
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(WriteConverterContext<LocalDateTime> context) {
+        if (context.getValue() == null) {
+            return new WriteCellData<>("");
+        }
+        return new WriteCellData<>(context.getValue().format(FORMatter));
+    }
+}

src/main/java/com/example/backend/excel/NumberUtils.java

@@ -0,0 +1,54 @@
+package com.example.backend.excel;
+
+import java.math.BigDecimal;
+
+public class NumberUtils {
+    
+    /**
+     * 将字符串转换为Integer
+     */
+    public static Integer parseToInteger(String str) {
+        if (str == null || str.trim().isEmpty()) {
+            return null;
+        }
+        
+        try {
+            return Integer.valueOf(str.trim());
+        } catch (NumberFormatException e) {
+            System.err.println("无法转换为Integer: " + str);
+            return null;
+        }
+    }
+    
+    /**
+     * 将字符串转换为BigDecimal
+     */
+    public static BigDecimal parseToBigDecimal(String str) {
+        if (str == null || str.trim().isEmpty()) {
+            return null;
+        }
+        
+        try {
+            return new BigDecimal(str.trim());
+        } catch (NumberFormatException e) {
+            System.err.println("无法转换为BigDecimal: " + str);
+            return null;
+        }
+    }
+    
+    /**
+     * 将字符串转换为Double
+     */
+    public static Double parseToDouble(String str) {
+        if (str == null || str.trim().isEmpty()) {
+            return null;
+        }
+        
+        try {
+            return Double.valueOf(str.trim());
+        } catch (NumberFormatException e) {
+            System.err.println("无法转换为Double: " + str);
+            return null;
+        }
+    }
+}

src/main/java/com/example/backend/excel/SalesContractExcelDTO.java

@@ -1,644 +1,181 @@
 package com.example.backend.excel;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 /**
- * 销售合同主表
+ * 销售合同主表 - 跳过标题列
  */
 @Data
 public class SalesContractExcelDTO {
 
-    @ExcelProperty("主键ID")
-    private Long id;
-
-    @ExcelProperty("销售合同号")
-    private String fno;
-
-    @ExcelProperty("单据日期")
-    private LocalDateTime fdate;
-
-    @ExcelProperty("销售合同号1")
-    private String sono;
-
-    @ExcelProperty("客户合同号")
-    private String ctOrderNo;
-
-    @ExcelProperty("合同类型")
-    private String bizType;
-
-    @ExcelProperty("业务账套")
-    private String acctSet;
-
-    @ExcelProperty("条款类型")
-    private String clauseType;
-
-    @ExcelProperty("签约日期")
-    private LocalDateTime signDate;
-
-    @ExcelProperty("代理采购协议号")
-    private String agentNo;
-
-    @ExcelProperty("佣金合同号")
-    private String commContrNo;
-
-    @ExcelProperty("合同起始有效期")
-    private LocalDateTime contrStart;
-
-    @ExcelProperty("合同截止有效期")
-    private LocalDateTime contrEnd;
-
-    @ExcelProperty("销售交货日期")
-    private LocalDateTime sDelivDt;
-
-    @ExcelProperty("合同描述")
-    private String contrDesc;
-
-    @ExcelProperty("我方编号")
-    private String fours;
-
-    @ExcelProperty("我方名称")
-    private String foursname;
-
-    @ExcelProperty("我方开户银行")
-    private String ourBankNm;
-
-    @ExcelProperty("我方银行账号")
-    private String ourBankAcct;
-
-    @ExcelProperty("客户代码")
-    private String ctNo;
-
-    @ExcelProperty("客户名称")
-    private String ctName;
-
-    @ExcelProperty("客户开户银行")
-    private String ctBankName;
-
-    @ExcelProperty("客户银行账户")
-    private String ctBankAcct;
-
-    @ExcelProperty("客户联系人名称")
-    private String ctContNm;
-
-    @ExcelProperty("币别")
-    private String curcy;
-
-    @ExcelProperty("折人民币汇率")
-    private BigDecimal rate;
-
-    @ExcelProperty("原币总金额")
-    private BigDecimal totalAmt;
-
-    @ExcelProperty("人民币总金额")
-    private BigDecimal totalCnyAmt;
-
-    @ExcelProperty("美元总金额")
-    private BigDecimal totalUsdAmt;
-
-    @ExcelProperty("总数量")
-    private BigDecimal totalQty;
-
-    @ExcelProperty("放货仓库代码")
-    private String stockno;
-
-    @ExcelProperty("放货仓库名称")
-    private String stockname;
-
-    @ExcelProperty("预估毛利率")
-    private BigDecimal estGrossMR;
-
-    @ExcelProperty("预估毛利金额")
-    private BigDecimal estGrossMA;
-
-    @ExcelProperty("预估成本总金额")
-    private BigDecimal estTotCost;
-
-    @ExcelProperty("预估费用总金额")
-    private BigDecimal estTotFee;
-
-    @ExcelProperty("预估回款周期")
-    private BigDecimal estPayCycle;
-
-    @ExcelProperty("预估资金成本")
-    private BigDecimal estFundCost;
-
-    @ExcelProperty("价格条款")
-    private String terms;
-
-    @ExcelProperty("签约地点")
-    private String signLoc;
-
-    @ExcelProperty("交货地点")
-    private String delivLoc;
-
-    @ExcelProperty("装运港")
-    private String lPort;
-
-    @ExcelProperty("目的港")
-    private String dPort;
-
-    @ExcelProperty("贸易国别")
-    private String trdCtry;
-
-    @ExcelProperty("收款方式")
-    private String rcptMtd;
-
-    @ExcelProperty("运输方式")
-    private String tranWay;
-
-    @ExcelProperty("价格说明")
-    private String priceDesc;
-
-    @ExcelProperty("计价公式")
-    private String priceForm;
-
-    @ExcelProperty("数量溢装%")
-    private BigDecimal qtyOver;
-
-    @ExcelProperty("数量短装%")
-    private BigDecimal qtyShort;
-
-    @ExcelProperty("金额溢装%")
-    private BigDecimal amtOver;
-
-    @ExcelProperty("金额短装%")
-    private BigDecimal amtShort;
-
-    @ExcelProperty("预收款比例")
-    private BigDecimal prepayRatio;
-
-    @ExcelProperty("预收款金额")
-    private BigDecimal prepayAmt;
-
-    @ExcelProperty("产地")
-    private String origin;
-
-    @ExcelProperty("结算指标")
-    private String settIndex;
-
-    @ExcelProperty("客户履约保证金支付日期")
-    private LocalDateTime ctPerfPayDt;
-
-    @ExcelProperty("客户履约保证金比例")
-    private BigDecimal ctPerfRatio;
-
-    @ExcelProperty("合同完结付款日期")
-    private LocalDateTime contrFinalPayDt;
-
-    @ExcelProperty("合同违约金比例")
-    private BigDecimal contrPenaltyRatio;
-
-    @ExcelProperty("提货期限")
-    private BigDecimal pickDueDays;
-
-    @ExcelProperty("开票天数")
-    private BigDecimal invDays;
-
-    @ExcelProperty("责任中心")
-    private String respCtrName;
-
-    @ExcelProperty("考核占比")
-    private BigDecimal assessRatio;
-
-    @ExcelProperty("占比金额")
-    private BigDecimal assessAmt;
-
-    @ExcelProperty("代理费计费方式")
-    private String billingMode;
-
-    @ExcelProperty("代理费计费比例/单价")
-    private BigDecimal billingRate;
-
-    @ExcelProperty("代理费计费金额")
-    private BigDecimal billingAmount;
-
-    @ExcelProperty("是否租船")
-    private String whetherChartering;
-
-    @ExcelProperty("合同执行人代码")
-    private String contrExecCd;
-
-    @ExcelProperty("合同执行人名称")
-    private String contrExecNm;
-
-    @ExcelProperty("合同名称")
-    private String contractName;
-
-    @ExcelProperty("合同标的")
-    private String contractSubjectMatter;
-
-    @ExcelProperty("合同大类")
-    private String bpoTypeS;
-
-    @ExcelProperty("合同细类")
-    private String bpoTypeT;
-
-    @ExcelProperty("是否法务格式合同")
-    private String ifLegalCheckFormat;
-
-    @ExcelProperty("是否经过法审")
-    private String ifLegalCheck;
-
-    @ExcelProperty("是否多次结算")
-    private String ifPayMultiple;
-
-    @ExcelProperty("是否阳光采购")
-    private String ifSunPurchase;
-
-    @ExcelProperty("未阳光采购理由")
-    private String sunPurInfo;
-
-    @ExcelProperty("未阳光采购理由（自定义）")
-    private String sunPurInfoCus;
-
-    @ExcelProperty("是否招投标")
-    private String ifBidding;
-
-    @ExcelProperty("是否集团外贸")
-    private String ifForeignTrade;
-
-    @ExcelProperty("变更说明")
-    private String changeDesc;
-
-    @ExcelProperty("合同变更人")
-    private String changePeople;
-
-    @ExcelProperty("合同变更日期")
-    private LocalDateTime changeDate;
-
-    @ExcelProperty("变更协议号")
-    private String changeAgreementNo;
-
-    @ExcelProperty("变更前合同版本号")
-    private String beforeChangeVer;
-
-    @ExcelProperty("保证金比例")
-    private BigDecimal ctmarginRatio;
-
-    @ExcelProperty("保证金金额")
-    private BigDecimal ctmarginAmount;
-
-    @ExcelProperty("中文船名")
-    private String chnShipName;
-
-    @ExcelProperty("英文船名")
-    private String engShipName;
-
-    @ExcelProperty("流程实例id")
-    private String processInstanceId;
-
-    @ExcelProperty("单据状态")
-    private String placed;
-
-    @ExcelProperty("业务id")
-    private Long fmodalid;
-
-    @ExcelProperty("数据来源id")
-    private Long sourceid;
-
-    @ExcelProperty("数据来源表")
-    private String sourcetable;
-
-    @ExcelProperty("图片")
-    private String imgIds;
-
-    @ExcelProperty("调取次数")
-    private Integer inc;
-
-    @ExcelProperty("关联id")
-    private Long rid;
-
-    @ExcelProperty("归档状态")
-    private String fsaved;
-
-    @ExcelProperty("备注信息")
-    private String remark;
-
-    @ExcelProperty("模版名称")
-    private String sysTemplateName;
-
-    @ExcelProperty("是否删除")
-    private Integer delFlag;
-
-    @ExcelProperty("制单人部门代码")
-    private String deptId;
-
-    @ExcelProperty("制单人部门名称")
-    private String deptName;
-
-    @ExcelProperty("制单人代码")
-    private String createBy;
-
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ExcelProperty("制单人名称")
-    private String createByName;
-
-    @ExcelProperty("更新账号")
-    private String updateBy;
-
-    @ExcelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-    @ExcelProperty("更新人")
-    private String updateByName;
-
-    @ExcelProperty("贸易方式")
-    private String tradeway;
-
-    @ExcelProperty("美元汇率")
-    private BigDecimal rateUsd;
-
-    @ExcelProperty("付款方式")
-    private String payment;
-
-    @ExcelProperty("预估资金利息")
-    private BigDecimal estFundInt;
-
-    @ExcelProperty("计费单价")
-    private BigDecimal billPrice;
-
-    @ExcelProperty("计费方式")
-    private String billMode;
-
-    @ExcelProperty("计费比例")
-    private BigDecimal billRate;
-
-    @ExcelProperty("计费金额")
-    private BigDecimal billAmt;
-
-    @ExcelProperty("变更次数")
-    private Integer fchno;
-
-    @ExcelProperty("IMP同步PLMS接口状态")
-    private String impToPLMSStatus;
-
-    @ExcelProperty("IMP同步PLMS接口数据状态")
-    private String impToPLMSFlag;
-
-    @ExcelProperty("首款质量依据")
-    private String firstQmGt;
-
-    @ExcelProperty("尾款质量依据")
-    private String endQmGist;
-
-    @ExcelProperty("结算方式")
-    private String settlementMethod;
-
-    @ExcelProperty("品种大类")
-    private String materialClass;
-
-    @ExcelProperty("签约日期")
-    private LocalDateTime signDt;
-
-    @ExcelProperty("合同生效日期")
-    private LocalDateTime validDate;
-
-    @ExcelProperty("合同执行人机构代码")
-    private String contrExecCdInstitutionId;
-
-    @ExcelProperty("合同执行人机构名称")
-    private String contrExecCdInstitutionNm;
-
-    @ExcelProperty("合同执行人部门代码")
-    private String contrExecCdDeptId;
-
-    @ExcelProperty("合同执行人部门名称")
-    private String contrExecCdDeptNm;
-
-    @ExcelProperty("IMP同步PLMS接口来源系统代码")
-    private String sysid;
-
-    @ExcelProperty("IMP同步PLMS接口账套代码")
-    private String bookId;
-
-    @ExcelProperty("IMP同步PLMS接口PLMS组织ID")
-    private String orgId;
-
-    @ExcelProperty("赊销预付标识")
-    private String ifpayAdvanceSellCredit;
-
-    @ExcelProperty("业务类型")
-    private String serviceType;
-
-    @ExcelProperty("审批摘要")
-    private String reviewAbstract;
-
-    @ExcelProperty("是否清底")
-    private String ifClearBottom;
-
-    @ExcelProperty("关闭状态")
-    private String fclosed;
-
-    @ExcelProperty("当前版本号")
-    private Integer curChangeVer;
-
-    @ExcelProperty("变更标识")
-    private Integer curChangeFlag;
-
-    @ExcelProperty("变更原因")
-    private String curChangeReason;
-
-    @ExcelProperty("变更时间")
-    private LocalDateTime curChangeTime;
-
-    @ExcelProperty("变更人")
-    private String curChangeUser;
-
-    @ExcelProperty("合同产品类型")
-    private String bizProductType;
-
-    @ExcelProperty("PLMS合同大类")
-    private String contractType;
-
-    @ExcelProperty("是否赊销")
-    private String ifSellCredit;
-
-    @ExcelProperty("预付白名单")
-    private String ifpayAdvanceWhitelist;
-
-    @ExcelProperty("装卸条款")
-    private String loadUnloadTerms;
-
-    @ExcelProperty("赊销白名单")
-    private String ifSellCreditWhitelist;
-
-    @ExcelProperty("装运港编号")
-    private String lpno;
-
-    @ExcelProperty("目的港编号")
-    private String dpno;
+    @ExcelProperty(index = 1)
+    private String sono; // 销售合同号
 
-    @ExcelProperty("长协合同号")
-    private String longTermContract;
+    @ExcelProperty(index = 2)
+    private String createBy; // 制单人代码
 
-    @ExcelProperty("是否长协")
-    private String ifLongTerm;
+    @ExcelProperty(index = 3)
+    private String createByName; // 制单人名称
 
-    @ExcelProperty("是否确认")
-    private Integer isConfirm;
+    @ExcelProperty(index = 4)
+    private String serviceType; // 业务类型
 
-    @ExcelProperty("交货方式")
-    private String delivMtd;
+    @ExcelProperty(index = 5)
+    private String bizType; // 合同类型
 
-    @ExcelProperty("保险种类")
-    private String insuranceType;
+    @ExcelProperty(index = 6)
+    private String bizProductType; // 合同产品类型
 
-    @ExcelProperty("保险费率%")
-    private BigDecimal insuranceAmt;
+    @ExcelProperty(index = 7)
+    private String contrExecCd; // 合同执行人代码
 
-    @ExcelProperty("是否借壳")
-    private String ifShell;
+    @ExcelProperty(index = 8)
+    private String contrExecNm; // 合同执行人名称
 
-    @ExcelProperty("借壳单位")
-    private String shellCompany;
+    @ExcelProperty(index = 9)
+    private String ctName; // 客户名称
 
-    @ExcelProperty("是否允许分批")
-    private String ifBatch;
+    @ExcelProperty(index = 10)
+    private String ctNo; // 客户代码
 
-    @ExcelProperty("是否允许转运")
-    private String ifTransfer;
+    @ExcelProperty(index = 11)
+    private String ctContNm; // 客户联系人名称
 
-    @ExcelProperty("钢材产品判断字段")
-    private String ifgc;
+    @ExcelProperty(index = 12)
+    private String ctBankName; // 客户开户银行
 
-    @ExcelProperty("执行美元汇率")
-    private BigDecimal rateUs;
+    @ExcelProperty(index = 13)
+    private String ctBankAcct; // 客户银行账户
 
-    @ExcelProperty("最迟装运日期")
-    private LocalDateTime estLoadDt;
+    @ExcelProperty(index = 14)
+    private String ctOrderNo; // 客户合同号
 
-    @ExcelProperty("最迟集港日期")
-    private LocalDateTime estArrDt;
+    @ExcelProperty(index = 15)
+    private String curcy; // 币别
 
-    @ExcelProperty("合同借壳评审人")
-    private String reviewer;
+    @ExcelProperty(index = 16)
+    private String estArrDt; // 最迟集港日期
 
-    @ExcelProperty("来源类型")
-    private String sourceType;
+    @ExcelProperty(index = 17)
+    private String estLoadDt; // 最迟装运日期
 
-    @ExcelProperty("来源类型")
-    private String sourceno;
+    @ExcelProperty(index = 18)
+    private String outstandingDay; // 预计客商占款天数
 
-    @ExcelProperty("平均单价")
-    private BigDecimal avePrice;
+    @ExcelProperty(index = 19)
+    private String fours; // 我方编号 ← 新增
 
-    @ExcelProperty("提交审批日期")
-    private LocalDateTime submissionDate;
+    @ExcelProperty(index = 20)
+    private String foursname; // 我方名称
 
-    @ExcelProperty("审批生效日期")
-    private LocalDateTime appEffectiveDate;
+    @ExcelProperty(index = 21)
+    private String ourBankAcct; // 我方银行账号
 
-    @ExcelProperty("保供合同一键三联类型")
-    private String oneClickSourcetype;
+    @ExcelProperty(index = 22)
+    private String ourBankNm; // 我方开户银行
 
-    @ExcelProperty("保供合同一键三联id")
-    private Long oneClickSourceid;
+    @ExcelProperty(index = 23)
+    private String ifClearBottom; // 是否清底
 
-    @ExcelProperty("海外公司名称")
-    private String overSeasName;
+    @ExcelProperty(index = 24)
+    private String ifLongTerm; // 是否长协
 
-    @ExcelProperty("海外公司代码")
-    private String overSeasNo;
+    @ExcelProperty(index = 25)
+    private String longTermContract; // 长协合同号
 
-    @ExcelProperty("装运国")
-    private String lPortCtry;
+    @ExcelProperty(index = 26)
+    private String lPort; // 装运港
 
-    @ExcelProperty("目的国")
-    private String dPortCtry;
+    @ExcelProperty(index = 27)
+    private String lPortCtry; // 装运国 ← 新增
 
-    @ExcelProperty("托管")
-    private String rptg;
+    @ExcelProperty(index = 28)
+    private String dPort; // 目的港
 
-    @ExcelProperty("合同不含税总金额")
-    private BigDecimal totalNtAmt;
+    @ExcelProperty(index = 29)
+    private String dPortCtry; // 目的国 ← 新增
 
-    @ExcelProperty("项目计划书单号")
-    private String ppRefNo;
+    @ExcelProperty(index = 30)
+    private String qtyOver; // 数量溢装%
 
-    @ExcelProperty("是否过磅数量结算")
-    private String ifWeighedSalesQty;
+    @ExcelProperty(index = 31)
+    private String qtyShort; // 数量短装%
 
-    @ExcelProperty("限价类别")
-    private String limitType;
+    @ExcelProperty(index = 32)
+    private String amtOver; // 金额溢装%
 
-    @ExcelProperty("电子合同标识")
-    private String electronicsFlag;
+    @ExcelProperty(index = 33)
+    private String amtShort; // 金额短装%
 
-    @ExcelProperty("合同文本类别")
-    private String contractTextType;
+    @ExcelProperty(index = 34)
+    private String insuranceType; // 保险种类
 
-    @ExcelProperty("合同状态")
-    private String contractStatus;
+    @ExcelProperty(index = 35)
+    private String insuranceAmt; // 保险费率%
 
-    @ExcelProperty("合同大类")
-    private String contractType2;
+    @ExcelProperty(index = 36)
+    private String rate; // 折人民币汇率 ← 新增
 
-    @ExcelProperty("单价类别")
-    private String unitPriceType;
+    @ExcelProperty(index = 37)
+    private String rateUs; // 执行美元汇率 ← 新增
 
-    @ExcelProperty("增值税率")
-    private BigDecimal inTaxRate;
+    @ExcelProperty(index = 38)
+    private String signLoc; // 签约地点
 
-    @ExcelProperty("是否含税标记")
-    private String iftax;
+    @ExcelProperty(index = 39)
+    private String terms; // 价格条款
 
-    @ExcelProperty("PLMS合同id")
-    private String plmscontractId;
+    @ExcelProperty(index = 40)
+    private String loadUnloadTerms; // 装卸条款
 
-    @ExcelProperty("PLMS合同编号")
-    private String plmscontractCode;
+    @ExcelProperty(index = 41)
+    private String delivLoc; // 交货地点
 
-    @ExcelProperty("是否指数合同")
-    private String contractIndexFlag;
+    @ExcelProperty(index = 42)
+    private String delivMtd; // 交货方式
 
-    @ExcelProperty("备用字段1")
-    private String extCol1;
+    @ExcelProperty(index = 43)
+    private String tranWay; // 运输方式
 
-    @ExcelProperty("计量单位代码")
-    private String measureUnitCode;
+    @ExcelProperty(index = 44)
+    private String whetherChartering; // 是否租船
 
-    @ExcelProperty("采购合同号")
-    private String pono;
+    @ExcelProperty(index = 45)
+    private String chnShipName; // 中文船名
 
-    @ExcelProperty("销售合同信用销售比例")
-    private BigDecimal prepayTrustRatio;
+    @ExcelProperty(index = 46)
+    private String engShipName; // 英文船名
 
-    @ExcelProperty("销售合同信用销售金额")
-    private BigDecimal prepayTrustAmt;
+    @ExcelProperty(index = 47)
+    private String agentNo; // 代理采购协议号
 
-    @ExcelProperty("代理销售协议号")
-    private String agentNoSo;
+    @ExcelProperty(index = 48)
+    private String agentNoSo; // 代理销售协议号
 
-    @ExcelProperty("印花税金额")
-    private BigDecimal stampTaxAmt;
+    @ExcelProperty(index = 49)
+    private String commContrNo; // 佣金合同号
 
-    @ExcelProperty("合同取消状态")
-    private String fclosedType;
+    @ExcelProperty(index = 50)
+    private String sDelivDt; // 销售交货日期
 
-    @ExcelProperty("产品名称")
-    private String mpsdesc;
+    @ExcelProperty(index = 51)
+    private String ifWeighedSalesQty; // 是否过磅数量结算
 
-    @ExcelProperty("预计客商占款天数")
-    private Integer outstandingDay;
+    @ExcelProperty(index = 52)
+    private String settIndex; // 结算指标
 
-    @ExcelProperty("未结金额")
-    private BigDecimal outstandingamt;
+    @ExcelProperty(index = 53)
+    private String ifBatch; // 是否允许分批
 
-    @ExcelProperty("我方英文名称")
-    private String foursnamee;
+    @ExcelProperty(index = 54)
+    private String ifTransfer; // 是否允许转运
 
-    @ExcelProperty("客户英文名称")
-    private String ctnamee;
+    @ExcelProperty(index = 55)
+    private String contrDesc; // 合同描述
 
-    @ExcelProperty("未税平均单价")
-    private BigDecimal avgNtprice;
+    @ExcelProperty(index = 56)
+    private String remark; // 备注信息
 
-    @ExcelProperty("英文品名")
-    private String edesc;
+    @ExcelProperty(index = 57)
+    private String pono; // 采购合同号
 }

src/main/java/com/example/backend/service/contract/SalesContractService.java

@@ -1,6 +1,8 @@
 package com.example.backend.service.contract;
 
 import com.example.backend.entity.contract.SalesContractEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -8,6 +10,7 @@ import java.util.List;
 /**
  * 销售合同服务接口
  */
+
 public interface SalesContractService {
 
     /**

src/main/java/com/example/backend/service/contract/impl/SalesContractServiceImpl.java

@@ -63,7 +63,7 @@ public class SalesContractServiceImpl implements SalesContractService {
         try {
             // ================= 主表 =================
             try {
-                List<SalesContractExcelDTO> mainDataList = ExcelUtils.readMainSheet(file);
+                List<SalesContractExcelDTO> mainDataList = ExcelUtil.readMainSheet(file);
                 if (mainDataList.isEmpty()) {
                     errors.add("主表(Sheet1) 数据为空");
                 } else {
@@ -76,7 +76,20 @@ public class SalesContractServiceImpl implements SalesContractService {
                             SalesContractExcelDTO dto = mainDataList.get(i);
                             SalesContractEntity entity = new SalesContractEntity();
                             BeanUtils.copyProperties(dto, entity);
-                            entity.setCreateTime(LocalDateTime.now());
+                            entity.setCreateTime(new Date());
+
+                            // === 日期字段转换 ===
+                            entity.setEstArrDt(DateUtils.parseToDate(dto.getEstArrDt()));
+                            entity.setEstLoadDt(DateUtils.parseToDate(dto.getEstLoadDt()));
+                            entity.setSDelivDt(DateUtils.parseToDate(dto.getSDelivDt()));
+
+                            // === 数值字段转换 ===
+                            entity.setOutstandingDay(NumberUtils.parseToInteger(dto.getOutstandingDay()));
+                            entity.setQtyOver(NumberUtils.parseToBigDecimal(dto.getQtyOver()));
+                            entity.setQtyShort(NumberUtils.parseToBigDecimal(dto.getQtyShort()));
+                            entity.setAmtOver(NumberUtils.parseToBigDecimal(dto.getAmtOver()));
+                            entity.setAmtShort(NumberUtils.parseToBigDecimal(dto.getAmtShort()));
+                            entity.setInsuranceAmt(NumberUtils.parseToBigDecimal(dto.getInsuranceAmt()));
 
                             // 记录当前处理的行号，用于错误提示
                             int currentRow = i + 1; // Excel行号从1开始
@@ -167,7 +180,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 errors.add("主表(Sheet1) 第 " + currentRow + " 行：客户名称有误！");
                                 currentRowValid = false;
                             }
-                            if (ctNameList != null && !ctNameList.get(0).getPlaced().equals("2")) {
+                            if (ctNameList != null && !ctNameList.isEmpty()&& !"2".equals(ctNameList.get(0).getPlaced())) {
                                 errors.add("主表(Sheet1) 第 " + currentRow + " 行：客户名称没有审批通过！");
                                 currentRowValid = false;
                             }
@@ -231,6 +244,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                                     currentRowValid = false;
                                 }
                             }
+                            if(StringUtils.isEmpty(entity.getFours())){
+                                errors.add("主表(Sheet1) 第 " + currentRow + " 行：我方编号不能为空!");
+                                currentRowValid = false;
+                            }
 
                             if (StringUtils.isEmpty(entity.getFoursname())) {
                                 errors.add("主表(Sheet1) 第 " + currentRow + " 行：我方名称不能为空!");
@@ -241,8 +258,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 errors.add("主表(Sheet1) 第 " + currentRow + " 行：我方名称有误！");
                                 currentRowValid = false;
                             }
-                            if (foursnameList != null && foursnameList.get(0).getFno().isEmpty()) {
-                                errors.add("主表(Sheet1) 第 " + currentRow + " 行：我方编号不能为空！");
+                            if (foursnameList != null && !foursnameList.get(0).getFno().isEmpty()) {
+                                if(!entity.getFours().equals(foursnameList.get(0).getFno())){
+                                    errors.add("主表(Sheet1) 第 " + currentRow + " 行：我方编号与匹配到的不符合！");
+                                }
                                 currentRowValid = false;
                             }
 
@@ -423,7 +442,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 
             // =================  产品明细 =================
             try {
-                List<SalesDtlExcelDTO> list = ExcelUtils.readSalesDtlSheet(file);
+                List<SalesDtlExcelDTO> list = ExcelUtil.readSalesDtlSheet(file);
                 if (!list.isEmpty() && cid != null) {
                     List<SalesDtlEntity> validEntities = new ArrayList<>(); // 存储校验通过的实体
 
@@ -644,7 +663,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 
             // ================= 收款计划 =================
             try {
-                List<SalesCollectExcelDTO> list = ExcelUtils.readSalesCollectSheet(file);
+                List<SalesCollectExcelDTO> list = ExcelUtil.readSalesCollectSheet(file);
                 if (!list.isEmpty() && cid != null) {
                     // 先进行所有校验
                     Map<String, List<SalesCollectExcelDTO>> groupedByFno = list.stream()
@@ -725,7 +744,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 
             // ================= 责任中心 =================
             try {
-                List<RCenterDtlExcelDTO> list = ExcelUtils.readRCenterDtlSheet(file);
+                List<RCenterDtlExcelDTO> list = ExcelUtil.readRCenterDtlSheet(file);
                 if (!list.isEmpty() && cid != null) {
                     // 按合同号分组
                     Map<String, List<RCenterDtlExcelDTO>> groupedByContract = list.stream()
@@ -839,7 +858,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 
 // ================= 费用明细 =================
             try {
-                List<FeeDtlExcelDTO> list = ExcelUtils.readFeelDtlSheet(file);
+                List<FeeDtlExcelDTO> list = ExcelUtil.readFeelDtlSheet(file);
                 if (!list.isEmpty() && cid != null) {
                     // 校验单个记录
                     for (int i = 0; i < list.size(); i++) {
@@ -891,7 +910,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 
 // ================= 服务费率 =================
             try {
-                List<ExpSvcRateExcelDTO> list = ExcelUtils.readExpSvcRateSheet(file);
+                List<ExpSvcRateExcelDTO> list = ExcelUtil.readExpSvcRateSheet(file);
                 if (!list.isEmpty() && cid != null) {
                     // 定义不需要校验服务费率的客户名单
                     Set<String> excludedCustomers = new HashSet<>(Arrays.asList(

src/main/resources/application.yml

@@ -4,6 +4,10 @@ server:
     context-path: /api
 
 spring:
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 10MB
   datasource:
     driver-class-name: dm.jdbc.driver.DmDriver
     url: jdbc:dm://10.19.13.211:5236
@@ -21,6 +25,8 @@ spring:
       test-on-borrow: false
       test-on-return: false
 
+
+
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml,classpath:mapper/contract/*.xml
   type-aliases-package: com.example.backend.entity

src/main/resources/mapper/SysUserMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="selectByCtName" resultType="com.example.backend.entity.common.SysUser">
-        select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,
+        select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,a.placed,
         case
         when IFNULL(ctAbbr, '') = '' then IFNULL(ctEnAbbr, '')
         else IFNULL(ctAbbr, '')