src/main/java/com/example/backend/entity/common/CustCtrl.java

@@ -488,6 +488,19 @@ public class CustCtrl {
     @TableField(exist = false)
     private String allocationCategory;
 
+    //国家
+    @TableField(exist = false)
+    private String countryCnNm;
+
+    //签约地
+    @TableField(exist = false)
+    private String signLoc;
+
+    //签约地
+    @TableField(exist = false)
+    private String cpal;
+
+
 
 
 

src/main/java/com/example/backend/entity/common/SysUser.java

@@ -270,11 +270,38 @@ public class SysUser {
     @TableField(exist = false)
     private BigDecimal rateUs;
 
+    @TableField(exist = false)
+    private BigDecimal rateUsd;
+
     //制单人部门编码
+
     @TableField(exist = false)
     private String deptCode;
 
 
+    @TableField(exist = false)
+    private String cpny;
+
+    @TableField(exist = false)
+    private String fourscode;
+
+//    @TableField(value="deptcode",exist = false)
+//    private String deptcode;
+
+    @TableField(exist = false)
+    private String fours;
+
+    @TableField(exist = false)
+    private String deptname;
+
+    @TableField(exist = false)
+    private String ctrylmbAddr;
+
+
+
+
+
+
 
 
 

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

@@ -23,7 +23,7 @@ public class SalesCollectExcelDTO {
     @ExcelProperty("账期(天)")
     private Integer payDays;
 
-    @ExcelProperty("收款方式")
+    @ExcelProperty("付款方式")
     private String payMode;
 
 

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

@@ -50,7 +50,7 @@ public class SalesContractExcelDTO {
     @ExcelProperty("币别")
     private String curcy;
 
-    @ExcelProperty("最迟装运日期")
+    @ExcelProperty("最迟装运时间")
     private Date estLoadDt;
 
     @ExcelProperty("价格条款")
@@ -59,7 +59,7 @@ public class SalesContractExcelDTO {
     @ExcelProperty("运输方式")
     private String tranWay;
 
-    @ExcelProperty("预计客商占款天数")
+    @ExcelProperty("预计客商占用天数")
     private Integer outstandingDay;
 
 

src/main/java/com/example/backend/mapper/contract/SysUserMapper.java

@@ -14,11 +14,11 @@ import java.util.List;
 @Mapper
 public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("select\n" +
-            "       b.user_code,b.user_name,b.user_desc\n" +
-            "from SGGMIIP.View_Dept_Code a\n" +
-            "         left join SGGMIIP.View_User_Code b on a.deptid = b.dept_id\n" +
-            "         left join SGGMIIP.addrctrl c on a.fourscode = c.hrDeptCode\n" +
-            "where b.user_code =#{userCode}")
+            "    b.user_auto_id as id ,\n" +
+            "    c.fno,c.cpny,a.deptcode as deptCode,a.*,b.* from SGGMIIP.View_Dept_Code a\n" +
+            "    left join SGGMIIP.View_User_Code b on a.deptid=b.dept_id\n" +
+            "     left join SGGMIIP.addrctrl  c on a.fourscode=c.hrDeptCode\n" +
+            "where b.user_code = #{userCode}")
     List<SysUser> selectContractByNo(@Param("userCode") String userCode);
 
 

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

@@ -167,10 +167,37 @@ public class SalesContractServiceImpl implements SalesContractService {
                         currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：合同执行人代码有误！");
                         currentContractValid = false;
                     }
+
                     if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getUserDesc().isEmpty()) {
                         entity.setContrExecNm(contractUserList.get(0).getUserDesc());
                     }
 
+                    if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getDeptId().isEmpty()) {
+                        entity.setDeptId(contractUserList.get(0).getDeptId());
+                    }
+
+
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getFno().isEmpty()) {
+                        entity.setFno(contractUserList.get(0).getFno());
+                    }
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getFourscode().isEmpty()) {
+                        entity.setContrExecCdInstitutionId(contractUserList.get(0).getFourscode());
+                    }
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !contractUserList.get(0).getCpny().isEmpty()) {
+                        entity.setContrExecCdInstitutionNm(contractUserList.get(0).getCpny());
+                    }
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !StringUtils.isEmpty(contractUserList.get(0).getDeptCode())) {
+                        entity.setContrExecCdDeptId(contractUserList.get(0).getDeptCode());
+                    }
+
+                    if (contractUserList != null && !contractUserList.isEmpty() && !StringUtils.isEmpty(contractUserList.get(0).getDeptName())) {
+                        entity.setContrExecCdDeptNm(contractUserList.get(0).getDeptName());
+                    }
+
                     if (StringUtils.isEmpty(entity.getCtName())) {
                         currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：客户名称不能为空！");
                         currentContractValid = false;
@@ -202,10 +229,20 @@ public class SalesContractServiceImpl implements SalesContractService {
                         currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：客户代码不能为空！");
                         currentContractValid = false;
                     }
+
+
+
+
+
                     if (ctNameList != null && !ctNameList.isEmpty() && !ctNameList.get(0).getFno().isEmpty()) {
                         entity.setCtNo(ctNameList.get(0).getFno());
                     }
 
+
+                    if (ctNameList != null && !ctNameList.isEmpty() && !ctNameList.get(0).getCtrylmbAddr().isEmpty()) {
+                        entity.setTrdCtry(ctNameList.get(0).getCtrylmbAddr());
+                    }
+
                     if (ctNameList != null && !ctNameList.isEmpty() && !ctNameList.get(0).getCtContNm().isEmpty()) {
                         entity.setCtContNm(ctNameList.get(0).getCtContNm());
                     }
@@ -217,10 +254,14 @@ public class SalesContractServiceImpl implements SalesContractService {
                         entity.setCtBankAcct(ctNameList.get(0).getCtBankAcct());
                     }
 
+
                     if (StringUtils.isEmpty(entity.getCurcy())) {
                         currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：币别不能为空！");
                         currentContractValid = false;
                     }
+                    if (!StringUtils.isEmpty(entity.getCurcy())) {
+                        entity.setCurcy(entity.getCurcy().split("-")[0]);
+                    }
 
                     List<SysUser> curcyList = sysUserMapper.selectByCurcy(entity.getCurcy());
                     if (curcyList == null || curcyList.isEmpty()) {
@@ -243,6 +284,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                         entity.setRateUs(curcyList.get(0).getRateUs());
                     }
 
+                    if (curcyList != null && !curcyList.isEmpty() && !Objects.isNull(curcyList.get(0).getRateUsd())) {
+                        entity.setRateUsd(curcyList.get(0).getRateUsd());
+                    }
+
                     if ("出口销售".equals(entity.getBizType()) || "转口销售".equals(entity.getBizType())) {
                         if (entity.getEstLoadDt() == null) {
                             currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：合同类型为出口销售或转口销售时，最迟装运日期不能为空！");
@@ -279,13 +324,44 @@ public class SalesContractServiceImpl implements SalesContractService {
                         entity.setOurBankNm(foursnameList.get(0).getOurBankNm());
                     }
 
+                    if (foursnameList != null && !foursnameList.isEmpty() && !foursnameList.get(0).getOurBankNm().isEmpty()) {
+                        entity.setOurBankNm(foursnameList.get(0).getOurBankNm());
+                    }
+
                     if (foursnameList != null && !foursnameList.isEmpty() && !foursnameList.get(0).getOurBankAcct().isEmpty()) {
                         entity.setOurBankAcct(foursnameList.get(0).getOurBankAcct());
                     }
 
+                    if (foursnameList != null && !foursnameList.isEmpty() && !foursnameList.get(0).getSignLoc().isEmpty()) {
+                        entity.setSignLoc(foursnameList.get(0).getSignLoc());
+                    }
+
+
+
+                    if (StringUtils.isEmpty(entity.getIfClearBottom())) {
+                        entity.setIfClearBottom("否");
+                    }
+
+
+                    // 设置默认值
+                    if (StringUtils.isEmpty(entity.getWhetherChartering())) {
+                        entity.setWhetherChartering("否");
+                    }
+                    if (StringUtils.isEmpty(entity.getIfLongTerm())) {
+                        entity.setIfLongTerm("否");
+                    }
                     if (StringUtils.isEmpty(entity.getIfClearBottom())) {
                         entity.setIfClearBottom("否");
                     }
+                    if (StringUtils.isEmpty(entity.getIfLegalCheck())) {
+                        entity.setIfLegalCheck("是");
+                    }
+                    if (StringUtils.isEmpty(entity.getIfPayMultiple())) {
+                        entity.setIfPayMultiple("是");
+                    }
+                    if (StringUtils.isEmpty(entity.getIfBidding())) {
+                        entity.setIfBidding("是");
+                    }
 
                     if ("铁矿石".equals(entity.getBizProductType()) || "煤炭".equals(entity.getBizProductType())) {
                         if (StringUtils.isEmpty(entity.getIfLongTerm())) {
@@ -332,12 +408,12 @@ public class SalesContractServiceImpl implements SalesContractService {
                         if (lPortList != null && !lPortList.isEmpty() && !lPortList.get(0).getFno().isEmpty()) {
                             entity.setLpno(lPortList.get(0).getFno());
                         }
-                        if (lPortList != null && !lPortList.isEmpty() && lPortList.get(0).getCountryName().isEmpty()) {
+                        if (lPortList != null && !lPortList.isEmpty() && lPortList.get(0).getCountryCnNm().isEmpty()) {
                             currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：装运国不能为空！");
                             currentContractValid = false;
                         }
-                        if (lPortList != null && !lPortList.isEmpty() && !lPortList.get(0).getCountryName().isEmpty()) {
-                            entity.setLPortCtry(lPortList.get(0).getCountryName());
+                        if (lPortList != null && !lPortList.isEmpty() && !lPortList.get(0).getCountryCnNm().isEmpty()) {
+                            entity.setLPortCtry(lPortList.get(0).getCountryCnNm());
                         }
 
                         if (StringUtils.isEmpty(entity.getDPort())) {
@@ -352,12 +428,12 @@ public class SalesContractServiceImpl implements SalesContractService {
                         if (dPortList != null && !dPortList.isEmpty() && !dPortList.get(0).getFno().isEmpty()) {
                             entity.setDpno(dPortList.get(0).getFno());
                         }
-                        if (dPortList != null && !dPortList.isEmpty() && dPortList.get(0).getCountryName().isEmpty()) {
+                        if (dPortList != null && !dPortList.isEmpty() && dPortList.get(0).getCountryCnNm().isEmpty()) {
                             currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：目的国不能为空！");
                             currentContractValid = false;
                         }
-                        if (dPortList != null && !dPortList.isEmpty() && !dPortList.get(0).getCountryName().isEmpty()) {
-                            entity.setDPortCtry(dPortList.get(0).getCountryName());
+                        if (dPortList != null && !dPortList.isEmpty() && !dPortList.get(0).getCountryCnNm().isEmpty()) {
+                            entity.setDPortCtry(dPortList.get(0).getCountryCnNm());
                         }
                     }
 
@@ -371,25 +447,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                         currentContractValid = false;
                     }
 
-                    // 设置默认值
-                    if (StringUtils.isEmpty(entity.getWhetherChartering())) {
-                        entity.setWhetherChartering("否");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfLongTerm())) {
-                        entity.setIfLongTerm("否");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfClearBottom())) {
-                        entity.setIfClearBottom("否");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfLegalCheck())) {
-                        entity.setIfLegalCheck("是");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfPayMultiple())) {
-                        entity.setIfPayMultiple("是");
-                    }
-                    if (StringUtils.isEmpty(entity.getIfBidding())) {
-                        entity.setIfBidding("是");
-                    }
+
 
                     // 额外校验逻辑
                     boolean needValidate = false;
@@ -411,29 +469,30 @@ public class SalesContractServiceImpl implements SalesContractService {
                             currentContractValid = false;
                         }
 
-                        if ("出口销售".equals(entity.getBizType()) || "转口销售".equals(entity.getBizType())) {
-                            if (StringUtils.isEmpty(entity.getTerms())) {
-                                currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：合同类型为出口销售或转口销售时，价格条款不能为空");
+
+                    }
+                    if ("出口销售".equals(entity.getBizType()) || "转口销售".equals(entity.getBizType())) {
+                        if (StringUtils.isEmpty(entity.getTerms())) {
+                            currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：合同类型为出口销售或转口销售时，价格条款不能为空");
+                            currentContractValid = false;
+                        }
+                        if (!StringUtils.isEmpty(entity.getTerms())) {
+                            List<DataDic> termsList = dicMapper.selectDicByTerms(entity.getTerms());
+                            if (termsList == null || termsList.isEmpty()) {
+                                currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：没有在数据字典中匹配到的该价格条款的类型");
                                 currentContractValid = false;
                             }
-                            if (!StringUtils.isEmpty(entity.getTerms())) {
-                                List<DataDic> termsList = dicMapper.selectDicByTerms(entity.getTerms());
-                                if (termsList == null || termsList.isEmpty()) {
-                                    currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：没有在数据字典中匹配到的该价格条款的类型");
-                                    currentContractValid = false;
-                                }
-                            }
                         }
+                    }
 
-                        if ("是".equals(entity.getWhetherChartering())) {
-                            if (StringUtils.isEmpty(entity.getChnShipName())) {
-                                currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：是否租船为是时,中文船名不能为空");
-                                currentContractValid = false;
-                            }
-                            if (StringUtils.isEmpty(entity.getEngShipName())) {
-                                currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：是否租船为是时,英文船名不能为空");
-                                currentContractValid = false;
-                            }
+                    if ("是".equals(entity.getWhetherChartering())) {
+                        if (StringUtils.isEmpty(entity.getChnShipName())) {
+                            currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：是否租船为是时,中文船名不能为空");
+                            currentContractValid = false;
+                        }
+                        if (StringUtils.isEmpty(entity.getEngShipName())) {
+                            currentContractErrors.add("主表(Sheet1) 第 " + currentRow + " 行：是否租船为是时,英文船名不能为空");
+                            currentContractValid = false;
                         }
                     }
 
@@ -459,12 +518,12 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 currentContractValid = false;
                             }
 
-                            if ("出口销售".equals(bizType) || "转口销售".equals(bizType)) {
-                                if (StringUtils.isEmpty(entity1.getBatchNo())) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：合同类型为出口销售或转口销售时，批次号不能为空！");
-                                    currentContractValid = false;
-                                }
-                            }
+//                            if ("出口销售".equals(bizType) || "转口销售".equals(bizType)) {
+//                                if (StringUtils.isEmpty(entity1.getBatchNo())) {
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：合同类型为出口销售或转口销售时，批次号不能为空！");
+//                                    currentContractValid = false;
+//                                }
+//                            }
 
                             if (StringUtils.isEmpty(entity1.getItemno())) {
                                 currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：商品编号不能为空！");
@@ -540,23 +599,23 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 }
                             }
 
-                            if (StringUtils.isEmpty(entity1.getCurcyPo())) {
-                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购币种不能为空！");
-                                currentContractValid = false;
-                            }
-
-                            List<CustCtrl> curcyList1 = custCtrlMapper.selectByCurcyPo(entity1.getCurcyPo());
-                            if (curcyList1 == null || curcyList1.isEmpty()) {
-                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购币种有误！");
-                                currentContractValid = false;
-                            }
-
-                            if (curcyList1 != null && !curcyList1.isEmpty() && !Objects.isNull(curcyList1.get(0).getRate()) && !Objects.isNull(entity1.getRatePo())) {
-                                if (entity1.getRatePo().compareTo(curcyList1.get(0).getRate()) != 0) {
-                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购汇率和匹配到的采购汇率不符!");
-                                    currentContractValid = false;
-                                }
-                            }
+//                            if (StringUtils.isEmpty(entity1.getCurcyPo())) {
+//                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购币种不能为空！");
+//                                currentContractValid = false;
+//                            }
+
+//                            List<CustCtrl> curcyList1 = custCtrlMapper.selectByCurcyPo(entity1.getCurcyPo());
+//                            if (curcyList1 == null || curcyList1.isEmpty()) {
+//                                currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购币种有误！");
+//                                currentContractValid = false;
+//                            }
+//
+//                            if (curcyList1 != null && !curcyList1.isEmpty() && !Objects.isNull(curcyList1.get(0).getRate()) && !Objects.isNull(entity1.getRatePo())) {
+//                                if (entity1.getRatePo().compareTo(curcyList1.get(0).getRate()) != 0) {
+//                                    currentContractErrors.add("产品明细(Sheet2) 合同号 " + currentSono + " 第 " + (i + 1) + " 行：采购汇率和匹配到的采购汇率不符!");
+//                                    currentContractValid = false;
+//                                }
+//                            }
 
                             // 产品类型特定校验
                             if ("铁矿石".equals(bizProductType)) {

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

@@ -3,15 +3,12 @@ package com.example.backend.util;
 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 com.example.backend.excel.*;
 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解析工具类 - 销售合同专用
@@ -25,12 +22,13 @@ public class ExcelUtil {
         SimpleDataListener<SalesContractExcelDTO> listener = new SimpleDataListener<>();
         EasyExcel.read(file.getInputStream(), SalesContractExcelDTO.class, listener)
                 .sheet() // 不指定sheet名称，读取第一个sheet
-                .headRowNumber(2) // 跳过前2行，从第3行开始读取（索引从0开始）
+                .headRowNumber(2) // 跳过前1行，从第2行开始读取（索引从0开始）
                 .doRead();
 
         List<SalesContractExcelDTO> dataList = listener.getDataList();
         System.out.println("主表读取到 " + dataList.size() + " 条数据");
 
+        // 跳过前两条数据
         return dataList;
     }
 
@@ -41,10 +39,13 @@ public class ExcelUtil {
         SimpleDataListener<SalesDtlExcelDTO> listener = new SimpleDataListener<>();
         EasyExcel.read(file.getInputStream(), SalesDtlExcelDTO.class, listener)
                 .sheet(1) // 第二个sheet（索引从0开始）
-                .headRowNumber(2) // 跳过前2行
+                .headRowNumber(1) // 跳过前0行
                 .doRead();
-        System.out.println("产品明细读取到 " + listener.getDataList().size() + " 条数据");
-        return listener.getDataList();
+        List<SalesDtlExcelDTO> dataList = listener.getDataList();
+        System.out.println("产品明细读取到 " + dataList.size() + " 条数据");
+
+        // 跳过前两条数据
+        return dataList;
     }
 
     /**
@@ -54,10 +55,13 @@ public class ExcelUtil {
         SimpleDataListener<SalesCollectExcelDTO> listener = new SimpleDataListener<>();
         EasyExcel.read(file.getInputStream(), SalesCollectExcelDTO.class, listener)
                 .sheet(2) // 第三个sheet
-                .headRowNumber(2) // 跳过前2行
+                .headRowNumber(1) // 跳过前0行
                 .doRead();
-        System.out.println("收款计划读取到 " + listener.getDataList().size() + " 条数据");
-        return listener.getDataList();
+        List<SalesCollectExcelDTO> dataList = listener.getDataList();
+        System.out.println("收款计划读取到 " + dataList.size() + " 条数据");
+
+        // 跳过前两条数据
+        return dataList;
     }
 
     /**
@@ -67,102 +71,88 @@ public class ExcelUtil {
         SimpleDataListener<RCenterDtlExcelDTO> listener = new SimpleDataListener<>();
         EasyExcel.read(file.getInputStream(), RCenterDtlExcelDTO.class, listener)
                 .sheet(3) // 第四个sheet
-                .headRowNumber(2) // 跳过前2行
+                .headRowNumber(1) // 跳过前0行
                 .doRead();
-        System.out.println("责任中心读取到 " + listener.getDataList().size() + " 条数据");
-        return listener.getDataList();
+        List<RCenterDtlExcelDTO> dataList = listener.getDataList();
+        System.out.println("责任中心读取到 " + dataList.size() + " 条数据");
+
+        // 跳过前两条数据
+        return dataList;
     }
 
     /**
-     * 读取费用明细sheet - Sheet5
+     * 读取服务费率sheet - Sheet5
      */
-    public static List<FeeDtlExcelDTO> readFeelDtlSheet(MultipartFile file) throws IOException {
-        SimpleDataListener<FeeDtlExcelDTO> listener = new SimpleDataListener<>();
-        EasyExcel.read(file.getInputStream(), FeeDtlExcelDTO.class, listener)
+    public static List<ExpSvcRateExcelDTO> readExpSvcRateSheet(MultipartFile file) throws IOException {
+        SimpleDataListener<ExpSvcRateExcelDTO> listener = new SimpleDataListener<>();
+        EasyExcel.read(file.getInputStream(), ExpSvcRateExcelDTO.class, listener)
                 .sheet(4) // 第五个sheet
-                .headRowNumber(2) // 跳过前2行
+                .headRowNumber(1) // 跳过前0行
                 .doRead();
-        System.out.println("费用明细读取到 " + listener.getDataList().size() + " 条数据");
-        return listener.getDataList();
+        List<ExpSvcRateExcelDTO> dataList = listener.getDataList();
+        System.out.println("服务费率读取到 " + dataList.size() + " 条数据");
+
+        // 跳过前两条数据
+        return dataList;
     }
 
     /**
-     * 读取服务费率sheet - Sheet6
+     * 跳过列表的前两条数据
+     * 如果数据不足2条，返回空列表
      */
-    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();
+    private static <T> List<T> skipFirstTwoRows(List<T> dataList) {
+        if (dataList == null || dataList.size() <= 2) {
+            System.out.println("数据不足2条，跳过后返回空列表");
+            return new ArrayList<>();
+        }
+
+        List<T> filteredList = new ArrayList<>(dataList.subList(2, dataList.size()));
+        System.out.println("跳过前2条数据后剩余: " + filteredList.size() + " 条");
+
+        // 打印跳过后的第一行数据用于调试
+        if (!filteredList.isEmpty()) {
+            System.out.println("跳过前2条后的第一行数据: " + filteredList.get(0));
+        }
+
+        return filteredList;
     }
 
     /**
-     * 调试方法：打印所有sheet的结构信息
+     * 读取Excel主表数据 - Sheet1（可配置跳过行数）
+     * @param skipRowsAfterHeader 跳过标题行后的行数
      */
-    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);
-                });
-            }
+    public static List<SalesContractExcelDTO> readMainSheet(MultipartFile file, int skipRowsAfterHeader) throws IOException {
+        SimpleDataListener<SalesContractExcelDTO> listener = new SimpleDataListener<>();
+        EasyExcel.read(file.getInputStream(), SalesContractExcelDTO.class, listener)
+                .sheet()
+                .headRowNumber(1) // 标题行在第2行
+                .doRead();
 
-            @Override
-            public void invoke(Object data, AnalysisContext context) {
-                rowCount++;
-                if (rowCount <= 3) { // 只打印前3行数据
-                    System.out.println("Sheet: " + context.readSheetHolder().getSheetName() +
-                            " - 第" + rowCount + "行: " + data);
-                }
-            }
+        List<SalesContractExcelDTO> dataList = listener.getDataList();
+        System.out.println("主表读取到 " + dataList.size() + " 条数据");
 
-            @Override
-            public void doAfterAllAnalysed(AnalysisContext context) {
-                System.out.println("Sheet: " + context.readSheetHolder().getSheetName() +
-                        " 总行数: " + rowCount);
-                rowCount = 0; // 重置行计数
-            }
-        }).doReadAll();
+        // 跳过指定行数
+        return skipRows(dataList, skipRowsAfterHeader);
     }
 
     /**
-     * 获取Excel中所有Sheet的名称（用于调试）
+     * 通用跳过行数方法
+     * @param skipCount 要跳过的行数
      */
-    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名称
-            }
+    private static <T> List<T> skipRows(List<T> dataList, int skipCount) {
+        if (dataList == null || dataList.size() <= skipCount) {
+            System.out.println("数据不足" + skipCount + "条，跳过后返回空列表");
+            return new ArrayList<>();
+        }
 
-            @Override
-            public void doAfterAllAnalysed(AnalysisContext context) {
-                // 完成分析
-            }
+        List<T> filteredList = new ArrayList<>(dataList.subList(skipCount, dataList.size()));
+        System.out.println("跳过前" + skipCount + "条数据后剩余: " + filteredList.size() + " 条");
 
-            @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();
+        if (!filteredList.isEmpty()) {
+            System.out.println("跳过前" + skipCount + "条后的第一行数据: " + filteredList.get(0));
+        }
 
-        return sheetNames;
+        return filteredList;
     }
 
     /**
@@ -176,7 +166,7 @@ public class ExcelUtil {
             dataList.add(data);
             // 打印第一行数据用于调试
             if (dataList.size() == 1) {
-                System.out.println("第一行数据示例: " + data.toString());
+                System.out.println("原始第一行数据: " + data.toString());
             }
         }
 

src/main/resources/mapper/CustCtrlMapper.xml

@@ -18,7 +18,7 @@
         order by a.fno desc
     </select>
     <select id="selectLPortByLportName" resultType="com.example.backend.entity.common.CustCtrl">
-        select fno,portName,portCd,portNm,country,countryName
+        select fno,portName,portCd,portNm,country,countryCnNm
         from SGGMIIP.portCtrl
         where nvl(del_flag, 0) !=1
         and isnull(country,'')!=''

src/main/resources/mapper/SysUserMapper.xml

@@ -36,7 +36,7 @@
 
     </select>
     <select id="selectByCreateBy" resultType="com.example.backend.entity.common.SysUser">
-        select a.id,a.dept_code, a.DEPT_NAME,c.user_desc,c.USER_CODE
+        select a.id,a.dept_code as deptCode, a.DEPT_NAME,c.user_desc,c.USER_CODE
         from SGGMIIP.SYS_DEPARTMENT a
                  join SGGMIIP.SYS_USER_DEPARTMENT b on a.id = b.DEPT_ID
                  join SGGMIIP.SYS_USER c on b.USER_ID = c.id