1.对销售合同进行完善测试，并不断修改代码2.已完成对销售合同的初步测试，1条合同数据已能正常导入测试表

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

@@ -474,7 +474,7 @@ public class CustCtrl {
 
     //部门编码
     @TableField(exist = false)
-    private String deptCdoe;
+    private String deptCode;
 
     //费用代码
     @TableField(exist = false)
@@ -494,4 +494,7 @@ public class CustCtrl {
 
 
 
+
+
+
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 合同错误日志表
@@ -26,5 +27,5 @@ public class ContractErrorLogEntity {
 
     // 创建时间
     @TableField("CREATE_DATE")
-    private LocalDateTime createDate;
+    private Date createDate;
 }

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

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
  * 销售合同收款计划
  */
 @Data
-@TableName("SGGMIIP.salesCollectMethod")
+@TableName("SGGMINFT.salesCollectMethod")
 public class SalesCollectMethodEntity {
 
     // 主键ID

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

@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 费用费率表
@@ -12,8 +11,8 @@ import java.time.LocalDateTime;
 @Data
 public class ExpSvcRateExcelDTO {
 
-    @ExcelProperty("主键ID")
-    private Long id;
+    @ExcelProperty("销售合同号")
+    private String fno;
 
     @ExcelProperty("款项类型")
     private String paymentType;
@@ -24,75 +23,9 @@ public class ExpSvcRateExcelDTO {
     @ExcelProperty("结束天数")
     private BigDecimal endDays;
 
-    @ExcelProperty("年化费率")
+    @ExcelProperty("年化费率%")
     private BigDecimal annualRate;
 
     @ExcelProperty("起步天数")
     private BigDecimal minDays;
-
-    @ExcelProperty("流程实例id")
-    private String processInstanceId;
-
-    @ExcelProperty("业务id")
-    private Long fmodalid;
-
-    @ExcelProperty("数据来源id")
-    private Long sourceid;
-
-    @ExcelProperty("数据来源表")
-    private String sourcetable;
-
-    @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 placed;
-
-    @ExcelProperty("图片")
-    private String imgIds;
-
-    @ExcelProperty("调取次数")
-    private Integer inc;
-
-    @ExcelProperty("关联id")
-    private Long rid;
-
-    @ExcelProperty("归档状态")
-    private String fsaved;
-
-    @ExcelProperty("模版名称")
-    private String sysTemplateName;
-
-    @ExcelProperty("是否删除")
-    private Integer delFlag;
-
-    @ExcelProperty("行号")
-    private Integer line;
-
-    @ExcelProperty("部门名称")
-    private String deptName;
-
-    @ExcelProperty("部门代码")
-    private String deptId;
-
-    @ExcelProperty("当前版本号")
-    private Integer curChangeVer;
-
-    @ExcelProperty("销售合同号")
-    private String fno;
 }

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

@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 费用明细表
@@ -12,123 +11,31 @@ import java.time.LocalDateTime;
 @Data
 public class FeeDtlExcelDTO {
 
-    @ExcelProperty("主键ID")
-    private Long id;
-
-    @ExcelProperty("预估费用代码")
-    private String feeCd;
+    @ExcelProperty("销售合同号")
+    private String fno;
 
     @ExcelProperty("费用名称")
     private String feeNm;
 
-    @ExcelProperty("币种")
-    private String curcy;
-
-    @ExcelProperty("汇率")
-    private BigDecimal rate;
-
-    @ExcelProperty("费用金额")
-    private BigDecimal feeAmt;
+    @ExcelProperty("费用税率%")
+    private BigDecimal taxRate;
 
     @ExcelProperty("费用描述")
     private String feeDesc;
 
-    @ExcelProperty("备注")
-    private String remark;
-
-    @ExcelProperty("费用单价")
-    private BigDecimal feePrice;
-
-    @ExcelProperty("计费方式")
-    private String chargeMode;
-
-    @ExcelProperty("行号")
-    private BigDecimal line;
-
-    @ExcelProperty("流程实例id")
-    private String processInstanceId;
-
-    @ExcelProperty("业务id")
-    private Long fmodalid;
-
-    @ExcelProperty("数据来源id")
-    private Long sourceid;
-
-    @ExcelProperty("数据来源表")
-    private String sourcetable;
-
-    @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 placed;
-
-    @ExcelProperty("图片")
-    private String imgIds;
-
-    @ExcelProperty("调取次数")
-    private Integer inc;
-
-    @ExcelProperty("关联id")
-    private Long rid;
-
-    @ExcelProperty("归档状态")
-    private String fsaved;
-
-    @ExcelProperty("模版名称")
-    private String sysTemplateName;
-
-    @ExcelProperty("是否删除")
-    private Integer delFlag;
-
-    @ExcelProperty("费用金额（不含税）")
-    private BigDecimal ntFeeAmt;
-
-    @ExcelProperty("费用承担方")
-    private String feePayer;
-
-    @ExcelProperty("销售合同号")
-    private String fno;
-
-    @ExcelProperty("部门名称")
-    private String deptName;
+    @ExcelProperty("币别")
+    private String curcy;
 
-    @ExcelProperty("部门代码")
-    private String deptId;
+    @ExcelProperty("费用金额")
+    private BigDecimal feeAmt;
 
     @ExcelProperty("费用分摊类型")
     private String allocationCategory;
 
-    @ExcelProperty("费用金额CNY")
-    private BigDecimal feeAmtCny;
-
-    @ExcelProperty("当前版本号")
-    private Integer curChangeVer;
-
-    @ExcelProperty("美元汇率")
-    private BigDecimal rateUsd;
-
-    @ExcelProperty("费用税率%")
-    private BigDecimal taxRate;
+    @ExcelProperty("备注")
+    private String remark;
 
-    @ExcelProperty("大类代码")
-    private String cateCode;
+    private String feeCd;
 
-    @ExcelProperty("大类名称")
-    private String cateName;
+    private BigDecimal rate ;
 }

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

@@ -4,7 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * 责任中心明细表
@@ -12,120 +11,36 @@ import java.time.LocalDateTime;
 @Data
 public class RCenterDtlExcelDTO {
 
-    @ExcelProperty("主键ID")
-    private Long id;
-
-    @ExcelProperty("行号")
-    private BigDecimal line;
-
-    @ExcelProperty("责任中心代码")
-    private String respCtrCode;
-
-    @ExcelProperty("责任中心名称")
-    private String respCtrName;
-
-    @ExcelProperty("金额考核占比%")
-    private BigDecimal assessRatio;
-
-    @ExcelProperty("占比金额")
-    private BigDecimal assessAmt;
-
-    @ExcelProperty("流程实例id")
-    private String processInstanceId;
-
     @ExcelProperty("销售合同号")
     private String fno;
 
-    @ExcelProperty("单据日期")
-    private LocalDateTime fdate;
-
-    @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 createBy;
-
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ExcelProperty("创建人")
-    private String createByName;
-
-    @ExcelProperty("更新账号")
-    private String updateBy;
-
-    @ExcelProperty("更新时间")
-    private LocalDateTime updateTime;
-
-    @ExcelProperty("更新人")
-    private String updateByName;
-
-    @ExcelProperty("制单人部门名称")
-    private String deptName;
-
-    @ExcelProperty("制单人部门代码")
-    private String deptId;
+    @ExcelProperty("公司代码")
+    private String institutionId;
 
-    @ExcelProperty("当前版本号")
-    private Integer curChangeVer;
+    @ExcelProperty("公司名称")
+    private String institutionNm;
 
     @ExcelProperty("利润考核占比%")
     private BigDecimal assessQtyRate;
 
-    @ExcelProperty("人员代码")
-    private String personid;
-
-    @ExcelProperty("人员名称")
-    private String personname;
+    @ExcelProperty("金额考核占比%")
+    private BigDecimal assessRatio;
 
-    @ExcelProperty("部门代码")
-    private String personDeptId;
+    @ExcelProperty("制单人代码")
+    private String createBy;
 
-    @ExcelProperty("部门名称")
+    @ExcelProperty(index =7)
     private String personDeptNm;
+    @ExcelProperty(index =8)
 
-    @ExcelProperty("公司代码")
-    private String institutionId;
-
-    @ExcelProperty("公司名称")
-    private String institutionNm;
+    private String personDeptId;
+    @ExcelProperty(index =9)
 
-    @ExcelProperty("保供合同一键三联id")
-    private Long oneClickSourceid;
+    private String deptId;
+    @ExcelProperty(index =10)
 
-    @ExcelProperty("保供合同一键三联类型")
-    private String oneClickSourcetype;
+    private String deptName;
+    @ExcelProperty(index =11)
 
-    @ExcelProperty("来源类型")
-    private String sourcetype;
+    private String createByName;
 }

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

@@ -12,111 +12,36 @@ import java.time.LocalDateTime;
 @Data
 public class SalesCollectExcelDTO {
 
-    @ExcelProperty("主键ID")
-    private Long id;
-
-    @ExcelProperty("计划发生日期")
-    private LocalDateTime planDt;
-
-    @ExcelProperty("款项类别")
-    private String paymentType;
-
-    @ExcelProperty("款项比例")
-    private BigDecimal paymentRatio;
-
-    @ExcelProperty("付款方式")
-    private String payMode;
-
-    @ExcelProperty("备注")
-    private String clauseRemark;
-
-    @ExcelProperty("流程实例id")
-    private String processInstanceId;
 
     @ExcelProperty("销售合同号")
     private String fno;
 
-    @ExcelProperty("单据日期")
-    private LocalDateTime fdate;
-
-    @ExcelProperty("单据状态")
-    private String placed;
+    @ExcelProperty("账期")
+    private Integer payDays;
 
-    @ExcelProperty("业务id")
-    private Long fmodalid;
+    @ExcelProperty("收款方式")
+    private String payMode;
 
-    @ExcelProperty("数据来源id")
-    private Long sourceid;
 
-    @ExcelProperty("数据来源表")
-    private String sourcetable;
+    @ExcelProperty("款项比例%")
+    private BigDecimal paymentRatio;
 
-    @ExcelProperty("图片")
-    private String imgIds;
+    @ExcelProperty("款项类别")
+    private String paymentType;
 
-    @ExcelProperty("调取次数")
-    private Integer inc;
+    @ExcelProperty("收款收证银行名称")
+    private String ourBankNm;
 
-    @ExcelProperty("关联id")
-    private Long rid;
+    @ExcelProperty("收款收证银行账户")
+    private String ourBankAcct;
 
-    @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 Integer curChangeVer;
-
-    @ExcelProperty("金额")
-    private BigDecimal paymentAmt;
-
-    @ExcelProperty("账期")
-    private Integer payDays;
-
-    @ExcelProperty("收款收证银行名称")
-    private String ourBankNm;
-
-    @ExcelProperty("收款收证银行账户")
-    private String ourBankAcct;
 
-    @ExcelProperty("来源类型")
-    private String sourcetype;
 
-    @ExcelProperty("保供合同一键三联id")
-    private Long oneClickSourceid;
 
-    @ExcelProperty("保供合同一键三联类型")
-    private String oneClickSourcetype;
 }

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

@@ -2,180 +2,165 @@ package com.example.backend.excel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 销售合同主表 - 跳过标题列
  */
 @Data
 public class SalesContractExcelDTO {
 
-    @ExcelProperty(index = 1)
-    private String sono; // 销售合同号
-
-    @ExcelProperty(index = 2)
-    private String createBy; // 制单人代码
-
-    @ExcelProperty(index = 3)
-    private String createByName; // 制单人名称
-
-    @ExcelProperty(index = 4)
-    private String serviceType; // 业务类型
-
-    @ExcelProperty(index = 5)
-    private String bizType; // 合同类型
-
-    @ExcelProperty(index = 6)
-    private String bizProductType; // 合同产品类型
-
-    @ExcelProperty(index = 7)
-    private String contrExecCd; // 合同执行人代码
+    @ExcelProperty("销售合同号")
+    private String sono;
 
-    @ExcelProperty(index = 8)
-    private String contrExecNm; // 合同执行人名称
+    @ExcelProperty("制单人代码")
+    private String createBy;
 
-    @ExcelProperty(index = 9)
-    private String ctName; // 客户名称
+    @ExcelProperty("制单人名称")
+    private String createByName;
 
-    @ExcelProperty(index = 10)
-    private String ctNo; // 客户代码
+    @ExcelProperty("业务类型")
+    private String serviceType;
 
-    @ExcelProperty(index = 11)
-    private String ctContNm; // 客户联系人名称
+    @ExcelProperty("合同类型")
+    private String bizType;
 
-    @ExcelProperty(index = 12)
-    private String ctBankName; // 客户开户银行
+    @ExcelProperty("合同产品类型")
+    private String bizProductType;
 
-    @ExcelProperty(index = 13)
-    private String ctBankAcct; // 客户银行账户
+    @ExcelProperty("合同执行人代码")
+    private String contrExecCd;
 
-    @ExcelProperty(index = 14)
-    private String ctOrderNo; // 客户合同号
+    @ExcelProperty("合同执行人名称")
+    private String contrExecNm;
 
-    @ExcelProperty(index = 15)
-    private String curcy; // 币别
+    @ExcelProperty("客户名称")
+    private String ctName;
 
-    @ExcelProperty(index = 16)
-    private String estArrDt; // 最迟集港日期
+    @ExcelProperty("客户联系人名称")
+    private String ctContNm;
 
-    @ExcelProperty(index = 17)
-    private String estLoadDt; // 最迟装运日期
+    @ExcelProperty("客户开户银行")
+    private String ctBankName;
 
-    @ExcelProperty(index = 18)
-    private String outstandingDay; // 预计客商占款天数
+    @ExcelProperty("客户银行账户")
+    private String ctBankAcct;
 
-    @ExcelProperty(index = 19)
-    private String fours; // 我方编号 ← 新增
+    @ExcelProperty("客户合同号")
+    private String ctOrderNo;
 
-    @ExcelProperty(index = 20)
-    private String foursname; // 我方名称
+    @ExcelProperty("币别")
+    private String curcy;
 
-    @ExcelProperty(index = 21)
-    private String ourBankAcct; // 我方银行账号
+    @ExcelProperty("最迟集港日期")
+    private Date estArrDt;
 
-    @ExcelProperty(index = 22)
-    private String ourBankNm; // 我方开户银行
+    @ExcelProperty("最迟装运日期")
+    private Date estLoadDt;
 
-    @ExcelProperty(index = 23)
-    private String ifClearBottom; // 是否清底
+    @ExcelProperty("预计客商占款天数")
+    private Integer outstandingDay;
 
-    @ExcelProperty(index = 24)
-    private String ifLongTerm; // 是否长协
+    @ExcelProperty("我方名称")
+    private String foursname;
 
-    @ExcelProperty(index = 25)
-    private String longTermContract; // 长协合同号
+    @ExcelProperty("我方银行账号")
+    private String ourBankAcct;
 
-    @ExcelProperty(index = 26)
-    private String lPort; // 装运港
+    @ExcelProperty("我方开户银行")
+    private String ourBankNm;
 
-    @ExcelProperty(index = 27)
-    private String lPortCtry; // 装运国 ← 新增
+    @ExcelProperty("是否清底")
+    private String ifClearBottom;
 
-    @ExcelProperty(index = 28)
-    private String dPort; // 目的港
+    @ExcelProperty("是否长协")
+    private String ifLongTerm;
 
-    @ExcelProperty(index = 29)
-    private String dPortCtry; // 目的国 ← 新增
+    @ExcelProperty("长协合同号")
+    private String longTermContract;
 
-    @ExcelProperty(index = 30)
-    private String qtyOver; // 数量溢装%
+    @ExcelProperty("装运港")
+    private String lPort;
 
-    @ExcelProperty(index = 31)
-    private String qtyShort; // 数量短装%
+    @ExcelProperty("目的港")
+    private String dPort;
 
-    @ExcelProperty(index = 32)
-    private String amtOver; // 金额溢装%
+    @ExcelProperty("数量溢装%")
+    private BigDecimal qtyOver;
 
-    @ExcelProperty(index = 33)
-    private String amtShort; // 金额短装%
+    @ExcelProperty("数量短装%")
+    private BigDecimal qtyShort;
 
-    @ExcelProperty(index = 34)
-    private String insuranceType; // 保险种类
+    @ExcelProperty("金额溢装%")
+    private BigDecimal amtOver;
 
-    @ExcelProperty(index = 35)
-    private String insuranceAmt; // 保险费率%
+    @ExcelProperty("金额短装%")
+    private BigDecimal amtShort;
 
-    @ExcelProperty(index = 36)
-    private String rate; // 折人民币汇率 ← 新增
+    @ExcelProperty("保险种类")
+    private String insuranceType;
 
-    @ExcelProperty(index = 37)
-    private String rateUs; // 执行美元汇率 ← 新增
+    @ExcelProperty("保险费率%")
+    private BigDecimal insuranceAmt;
 
-    @ExcelProperty(index = 38)
-    private String signLoc; // 签约地点
+    @ExcelProperty("签约地点")
+    private String signLoc;
 
-    @ExcelProperty(index = 39)
-    private String terms; // 价格条款
+    @ExcelProperty("价格条款")
+    private String terms;
 
-    @ExcelProperty(index = 40)
-    private String loadUnloadTerms; // 装卸条款
+    @ExcelProperty("装卸条款")
+    private String loadUnloadTerms;
 
-    @ExcelProperty(index = 41)
-    private String delivLoc; // 交货地点
+    @ExcelProperty("交货地点")
+    private String delivLoc;
 
-    @ExcelProperty(index = 42)
-    private String delivMtd; // 交货方式
+    @ExcelProperty("交货方式")
+    private String delivMtd;
 
-    @ExcelProperty(index = 43)
-    private String tranWay; // 运输方式
+    @ExcelProperty("运输方式")
+    private String tranWay;
 
-    @ExcelProperty(index = 44)
-    private String whetherChartering; // 是否租船
+    @ExcelProperty("是否租船")
+    private String whetherChartering;
 
-    @ExcelProperty(index = 45)
-    private String chnShipName; // 中文船名
+    @ExcelProperty("中文船名")
+    private String chnShipName;
 
-    @ExcelProperty(index = 46)
-    private String engShipName; // 英文船名
+    @ExcelProperty("英文船名")
+    private String engShipName;
 
-    @ExcelProperty(index = 47)
-    private String agentNo; // 代理采购协议号
+    @ExcelProperty("代理采购协议号")
+    private String agentNo;
 
-    @ExcelProperty(index = 48)
-    private String agentNoSo; // 代理销售协议号
+    @ExcelProperty("代理销售协议号")
+    private String agentNoSo;
 
-    @ExcelProperty(index = 49)
-    private String commContrNo; // 佣金合同号
+    @ExcelProperty("佣金合同号")
+    private String commContrNo;
 
-    @ExcelProperty(index = 50)
-    private String sDelivDt; // 销售交货日期
+    @ExcelProperty("销售交货日期")
+    private Date sDelivDt;
 
-    @ExcelProperty(index = 51)
-    private String ifWeighedSalesQty; // 是否过磅数量结算
+    @ExcelProperty("是否过磅数量结算")
+    private String ifWeighedSalesQty;
 
-    @ExcelProperty(index = 52)
-    private String settIndex; // 结算指标
+    @ExcelProperty("结算指标")
+    private String settIndex;
 
-    @ExcelProperty(index = 53)
-    private String ifBatch; // 是否允许分批
+    @ExcelProperty("是否允许分批")
+    private String ifBatch;
 
-    @ExcelProperty(index = 54)
-    private String ifTransfer; // 是否允许转运
+    @ExcelProperty("是否允许转运")
+    private String ifTransfer;
 
-    @ExcelProperty(index = 55)
-    private String contrDesc; // 合同描述
+    @ExcelProperty("合同描述")
+    private String contrDesc;
 
-    @ExcelProperty(index = 56)
-    private String remark; // 备注信息
+    @ExcelProperty("备注信息")
+    private String remark;
 
-    @ExcelProperty(index = 57)
-    private String pono; // 采购合同号
+    @ExcelProperty("采购合同号")
+    private String pono;
 }

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

@@ -4,46 +4,36 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
- * 销售合同产品明细 销售批次表从表
+ * 销售合同产品明细
  */
 @Data
 public class SalesDtlExcelDTO {
 
-    @ExcelProperty("主键ID")
-    private Long id;
-
-    @ExcelProperty("行号")
-    private BigDecimal line;
-
-    @ExcelProperty("销售合同主键")
-    private Long rrid;
+    @ExcelProperty("销售合同号")
+    private String fno;
 
     @ExcelProperty("商品编号")
     private String itemno;
 
-    @ExcelProperty("中文品名")
-    private String sdesc;
+    @ExcelProperty("采购币种")
+    private String curcyPo;
 
-    @ExcelProperty("英文品名")
-    private String edesc;
+    @ExcelProperty("增值税率%")
+    private BigDecimal inTaxRate;
 
-    @ExcelProperty("规格描述")
-    private String spec;
+    @ExcelProperty("含铁量%")
+    private BigDecimal ironCont;
 
     @ExcelProperty("水分%")
     private BigDecimal moisture;
 
-    @ExcelProperty("含铁量%")
-    private BigDecimal ironCont;
-
-    @ExcelProperty("湿吨数量")
-    private BigDecimal wetTonQty;
+    @ExcelProperty("煤焦计价水%")
+    private BigDecimal coalMoisture;
 
-    @ExcelProperty("干吨数量")
-    private BigDecimal dryTonQty;
+    @ExcelProperty("采购单价")
+    private BigDecimal poprice;
 
     @ExcelProperty("计价方式")
     private String priceMtd;
@@ -51,248 +41,41 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("数量")
     private BigDecimal qty;
 
-    @ExcelProperty("销售单价")
-    private BigDecimal soPrice;
-
-    @ExcelProperty("不含税单价")
-    private BigDecimal ntSoPrice;
-
-    @ExcelProperty("单位")
-    private String ut;
-
-    @ExcelProperty("原币金额")
-    private BigDecimal soAmt;
-
-    @ExcelProperty("未税金额")
-    private BigDecimal ntSoAmt;
-
-    @ExcelProperty("税额")
-    private BigDecimal taxAmt;
-
-    @ExcelProperty("本币金额")
-    private BigDecimal localAmt;
-
-    @ExcelProperty("美元金额")
-    private BigDecimal usdAmt;
-
-    @ExcelProperty("海关编码")
-    private String hsCode;
-
-    @ExcelProperty("海关中文名称")
-    private String hsNameCn;
-
-    @ExcelProperty("海关英文名称")
-    private String hsNameEn;
-
-    @ExcelProperty("关税税率%")
-    private BigDecimal dutyRate;
-
-    @ExcelProperty("进项税率%")
-    private BigDecimal inTaxRate;
+    @ExcelProperty("采购汇率")
+    private BigDecimal ratePo;
 
     @ExcelProperty("退税率 %")
     private BigDecimal reTaxRate;
 
-    @ExcelProperty("销项税率%")
-    private BigDecimal outTaxRate;
-
-    @ExcelProperty("备注")
-    private String remark;
-
-    @ExcelProperty("流程实例id")
-    private String processInstanceId;
-
-    @ExcelProperty("销售合同号")
-    private String fno;
-
-    @ExcelProperty("单据日期")
-    private LocalDateTime fdate;
-
-    @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 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 batchNo;
-
-    @ExcelProperty("合同号")
-    private String sono;
-
-    @ExcelProperty("供应商代码")
-    private String supCode;
-
-    @ExcelProperty("供应商名称")
-    private String supName;
-
-    @ExcelProperty("未税金额")
-    private BigDecimal ntPoAmt;
-
-    @ExcelProperty("未税单价")
-    private BigDecimal ntPoPrice;
-
-    @ExcelProperty("采购单价")
-    private BigDecimal poprice;
-
-    @ExcelProperty("采购金额")
-    private BigDecimal poamt;
-
     @ExcelProperty("资源号")
     private String resourceNo;
 
-    @ExcelProperty("采购合同号")
-    private String pono;
-
-    @ExcelProperty("客户订单号")
-    private String ctOrderNo;
-
-    @ExcelProperty("客户代码")
-    private String ctNo;
-
-    @ExcelProperty("客户名称")
-    private String ctName;
-
-    @ExcelProperty("采购币种")
-    private String curcyPo;
-
-    @ExcelProperty("采购汇率")
-    private BigDecimal ratePo;
-
-    @ExcelProperty("业务账套")
-    private String acctSet;
-
-    @ExcelProperty("人民币含税金额")
-    private BigDecimal cnypoam;
-
-    @ExcelProperty("美元含税金额")
-    private BigDecimal usdpoamt;
-
-    @ExcelProperty("销售币种")
-    private String curcySo;
-
-    @ExcelProperty("销售汇率")
-    private BigDecimal rateSo;
-
-    @ExcelProperty("销售美元汇率")
-    private String rateUsdSo;
-
-    @ExcelProperty("人民币含税金额")
-    private BigDecimal cnysoamt;
-
-    @ExcelProperty("美元含税金额")
-    private BigDecimal usdsoamt;
-
-    @ExcelProperty("采购产品ID")
-    private Long poid;
-
-    @ExcelProperty("销售产品ID")
-    private Long soid;
-
-    @ExcelProperty("商品大类")
-    private String typeName;
-
-    @ExcelProperty("销售产品分摊费用合计CNY")
-    private BigDecimal soShareFeeCny;
-
-    @ExcelProperty("销售产品单位分摊费用CNY")
-    private BigDecimal soUnitFeeCny;
-
-    @ExcelProperty("采购产品分摊费用合计CNY")
-    private BigDecimal poShareFeeCny;
-
-    @ExcelProperty("采购产品单位分摊费用CNY")
-    private BigDecimal poUnitFeeCny;
-
-    @ExcelProperty("当前版本号")
-    private Integer curChangeVer;
-
-    @ExcelProperty("来源单号")
-    private String sourceno;
-
-    @ExcelProperty("装运港")
-    private String lPort;
-
-    @ExcelProperty("目的港")
-    private String dPort;
-
-    @ExcelProperty("中文规格描述")
-    private String specCn;
-
-    @ExcelProperty("牌号")
-    private String brand;
+    @ExcelProperty("钢厂资源号")
+    private String smrNo;
 
-    @ExcelProperty("厚")
-    private BigDecimal fnum1;
+    @ExcelProperty("批次号")
+    private String batchNo;
 
-    @ExcelProperty("宽")
-    private BigDecimal fnum2;
+    @ExcelProperty("QP描述")
+    private String qpDesc;
 
-    @ExcelProperty("长")
-    private BigDecimal fnum3;
+    @ExcelProperty("规格描述")
+    private String spec;
 
     @ExcelProperty("件数")
     private BigDecimal qua;
 
-    @ExcelProperty("单重")
-    private BigDecimal snw;
+    @ExcelProperty("销售单价")
+    private BigDecimal soPrice;
 
-    @ExcelProperty("卷重范围")
-    private String ftype1;
+    @ExcelProperty("长")
+    private BigDecimal fnum3;
 
     @ExcelProperty("米重")
     private BigDecimal fnum4;
 
-    @ExcelProperty("直径")
-    private BigDecimal fnum5;
+    @ExcelProperty("捆数")
+    private BigDecimal fnum8;
 
     @ExcelProperty("捆单重")
     private BigDecimal fnum6;
@@ -300,72 +83,42 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("捆支数")
     private BigDecimal fnum7;
 
-    @ExcelProperty("H型钢规格")
-    private String ftype2;
-
-    @ExcelProperty("规格描述")
-    private String ftype3;
-
-    @ExcelProperty("计重方式")
-    private String ftype4;
-
     @ExcelProperty("色标")
     private String ftype5;
 
-    @ExcelProperty("捆数")
-    private BigDecimal fnum8;
-
-    @ExcelProperty("数值预留字段2")
-    private BigDecimal fnum9;
-
-    @ExcelProperty("文本预留字段1")
-    private String ftype6;
-
     @ExcelProperty("螺纹规格库")
     private String ftype7;
 
-    @ExcelProperty("煤焦计价水%")
-    private BigDecimal coalMoisture;
+    @ExcelProperty("计重方式")
+    private String ftype4;
 
-    @ExcelProperty("钢厂资源号")
-    private String smrNo;
+    @ExcelProperty("净重")
+    private BigDecimal fnw;
 
     @ExcelProperty("毛重")
     private BigDecimal fgw;
 
-    @ExcelProperty("净重")
-    private BigDecimal fnw;
+    @ExcelProperty("税额")
+    private BigDecimal taxAmt;
 
-    @ExcelProperty("钢材产品判断字段")
-    private String ifgc;
+    @ExcelProperty("单位")
+    private String ut;
 
     @ExcelProperty("装运港")
-    private String sourcetype;
-
-    @ExcelProperty("装运港代码")
-    private String lpno;
-
-    @ExcelProperty("目的港代码")
-    private String dpno;
-
-    @ExcelProperty("保供合同一键三联ID")
-    private Long oneClickSourceid;
-
-    @ExcelProperty("保供合同一键三联类型")
-    private String oneClickSourcetype;
+    private String lPort;
 
-    @ExcelProperty("采购计价方式")
-    private String priceMtdPo;
+    @ExcelProperty("目的港")
+    private String dPort;
 
-    @ExcelProperty("出口关税税率%")
-    private BigDecimal eDutyRate;
+    @ExcelProperty("海关编码")
+    private String hsCode;
 
-    @ExcelProperty("计价数量")
-    private BigDecimal priceQty;
+    @ExcelProperty("海关中文名称")
+    private String hsNameCn;
 
-    @ExcelProperty("数量占比")
-    private BigDecimal qtyRate;
+    @ExcelProperty("海关英文名称")
+    private String hsNameEn;
 
-    @ExcelProperty("金额占比")
-    private BigDecimal amtRate;
+    @ExcelProperty("备注")
+    private String remark;
 }

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

@@ -3,7 +3,11 @@ package com.example.backend.mapper.contract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.backend.entity.contract.SalesContractEntity;
 import com.example.backend.entity.contract.SalesDtlEntity;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 销售合同主表Mapper
@@ -11,4 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SalesDtlMapper extends BaseMapper<SalesDtlEntity> {
 
+
+
+
 }

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

@@ -76,20 +76,36 @@ public class SalesContractServiceImpl implements SalesContractService {
                             SalesContractExcelDTO dto = mainDataList.get(i);
                             SalesContractEntity entity = new SalesContractEntity();
                             BeanUtils.copyProperties(dto, entity);
+                            //删除已经存在的合同
+                            if(!StringUtils.isEmpty(entity.getSono())) {
+                                List<Long> idList = salesContractMapper.selectList(new QueryWrapper<SalesContractEntity>()
+                                                .select("id")
+                                                .eq("sono", entity.getSono()))
+                                        .stream()
+                                        .map(SalesContractEntity::getId)
+                                        .collect(Collectors.toList());
+                                salesContractMapper.deleteBatchIds(idList);
+                                salesDtlMapper.delete(new QueryWrapper<SalesDtlEntity>().in("rid", idList));
+                                salesCollectMethodMapper.delete(new QueryWrapper<SalesCollectMethodEntity>().in("rid", idList));
+                                rCenterDtlMapper.delete(new QueryWrapper<RCenterDtlEntity>().in("rid", idList));
+                                feeDtlMapper.delete(new QueryWrapper<FeeDtlEntity>().in("rid", idList));
+                                expSvcRateMapper.delete(new QueryWrapper<ExpSvcRateEntity>().in("rid", idList));
+                            }
+
                             entity.setCreateTime(new Date());
 
                             // === 日期字段转换 ===
-                            entity.setEstArrDt(DateUtils.parseToDate(dto.getEstArrDt()));
-                            entity.setEstLoadDt(DateUtils.parseToDate(dto.getEstLoadDt()));
-                            entity.setSDelivDt(DateUtils.parseToDate(dto.getSDelivDt()));
+//                            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()));
+//                            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开始
@@ -180,10 +196,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 errors.add("主表(Sheet1) 第 " + currentRow + " 行：客户名称有误！");
                                 currentRowValid = false;
                             }
-                            if (ctNameList != null && !ctNameList.isEmpty()&& !"2".equals(ctNameList.get(0).getPlaced())) {
-                                errors.add("主表(Sheet1) 第 " + currentRow + " 行：客户名称没有审批通过！");
-                                currentRowValid = false;
-                            }
+//                            if (ctNameList != null && !ctNameList.isEmpty()&& !"2".equals(ctNameList.get(0).getPlaced())) {
+//                                errors.add("主表(Sheet1) 第 " + currentRow + " 行：客户名称没有审批通过！");
+//                                currentRowValid = false;
+//                            }
                             ctName = entity.getCtName();
 
                             if (ctNameList != null && ctNameList.get(0).getFno().isEmpty()) {
@@ -244,10 +260,7 @@ 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 + " 行：我方名称不能为空!");
@@ -471,9 +484,6 @@ public class SalesContractServiceImpl implements SalesContractService {
                             if (StringUtils.isEmpty(entity.getUt())) {
                                 errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：单位不能为空");
                             }
-                            if (StringUtils.isEmpty(entity.getSdesc())) {
-                                errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：中文品名不能为空");
-                            }
 
                             List<CustCtrl> itemnoList = custCtrlMapper.selectByItemno(entity.getItemno(), bizProductType);
                             if (itemnoList == null || itemnoList.isEmpty()) {
@@ -485,7 +495,10 @@ public class SalesContractServiceImpl implements SalesContractService {
                             }
 
                             if (itemnoList != null && !Objects.isNull(itemnoList.get(0).getInTaxRate())) {
-                                if (!Objects.equals(entity.getInTaxRate(), itemnoList.get(0).getInTaxRate())) {
+                                BigDecimal taxRate1 = entity.getInTaxRate();
+                                BigDecimal taxRate2 = itemnoList.get(0).getInTaxRate();
+
+                                if (taxRate1 != null && taxRate2 != null && taxRate1.compareTo(taxRate2) != 0) {
                                     errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：输入的增值税率与匹配增值税率不一致！");
                                 }
                             }
@@ -509,9 +522,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                             }
 
                             if (itemnoList != null && !itemnoList.get(0).getSdesc().isEmpty()) {
-                                if (!entity.getSdesc().equals(itemnoList.get(0).getSdesc())) {
-                                    errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：输入的中文品名与匹配到的中文品名不一致！");
-                                }
+                                entity.setSdesc(itemnoList.get(0).getSdesc());
                             }
 
                             if (itemnoList != null && !itemnoList.get(0).getEdesc().isEmpty()) {
@@ -538,7 +549,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                             }
 
                             if (curcyList != null && !curcyList.isEmpty() && !Objects.isNull(curcyList.get(0).getRate()) && !Objects.isNull(entity.getRatePo())) {
-                                if (Objects.equals(entity.getRatePo(), curcyList.get(0).getRate())) {
+                                if (entity.getRatePo().compareTo(curcyList.get(0).getRate())!=0) {
                                     errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：采购汇率和匹配到的采购汇率不符!");
                                 }
                             }
@@ -584,14 +595,13 @@ public class SalesContractServiceImpl implements SalesContractService {
                             }
 
                             if ("钢产品".equals(bizProductType)) {
-                                if (StringUtils.isEmpty(entity.getBrand())) {
+
+                                List<CustCtrl> itemnoList1 = custCtrlMapper.selectByItemno(entity.getItemno(), bizProductType);
+                                if (itemnoList1 != null && !itemnoList1.isEmpty() && itemnoList1.get(0).getBrand().isEmpty()) {
                                     errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：合同产品类型为钢产品时，牌号不能为空！");
                                 }
-                                List<CustCtrl> itemnoList1 = custCtrlMapper.selectByItemno(entity.getItemno(), bizProductType);
                                 if (itemnoList1 != null && !itemnoList1.isEmpty() && !itemnoList1.get(0).getBrand().isEmpty()) {
-                                    if (!entity.getBrand().equals(itemnoList1.get(0).getBrand())) {
-                                        errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：输入的牌号与匹配到的牌号不一致！");
-                                    }
+                                    entity.setBrand(itemnoList1.get(0).getBrand());
                                 }
 
                                 if (StringUtils.isEmpty(entity.getFtype3())) {
@@ -604,7 +614,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 }
                                 if (ftype3List != null && !ftype3List.isEmpty() && !Objects.isNull(ftype3List.get(0).getFnum4())
                                         && !Objects.isNull(entity.getFnum4())) {
-                                    if (!Objects.equals(entity.getFnum4(), ftype3List.get(0).getFnum4())) {
+                                    if (entity.getFnum4().compareTo(ftype3List.get(0).getFnum4())!=0) {
                                         errors.add("产品明细(Sheet2) 第 " + currentRow + " 行：输入的米重与匹配到的米重不一致！");
                                     }
                                 }
@@ -795,12 +805,12 @@ public class SalesContractServiceImpl implements SalesContractService {
                             errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：部门名称有误！");
                         }
 
-                        if (personDeptNmList != null && !personDeptNmList.isEmpty() && personDeptNmList.get(0).getDeptCdoe().isEmpty()) {
+                        if (personDeptNmList != null && !personDeptNmList.isEmpty() && personDeptNmList.get(0).getDeptCode().isEmpty()) {
                             errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：匹配到的部门编码为空");
                         }
 
-                        if (personDeptNmList != null && !personDeptNmList.isEmpty() && !personDeptNmList.get(0).getDeptCdoe().isEmpty()) {
-                            dto.setPersonDeptId(personDeptNmList.get(0).getDeptCdoe());
+                        if (personDeptNmList != null && !personDeptNmList.isEmpty() && !personDeptNmList.get(0).getDeptCode().isEmpty()) {
+                            dto.setPersonDeptId(personDeptNmList.get(0).getDeptCode());
                         }
 
                         if (personDeptNmList != null && !personDeptNmList.isEmpty() && StringUtils.isEmpty(dto.getInstitutionNm())
@@ -823,11 +833,11 @@ public class SalesContractServiceImpl implements SalesContractService {
                                 errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：制单人代码有误！");
                             }
 
-                            if (createByList != null && !createByList.isEmpty() && createByList.get(0).getDeptCode().isEmpty()) {
+                            if (createByList != null && !createByList.isEmpty() && createByList.get(0).getId().isEmpty()) {
                                 errors.add("责任中心(Sheet4) 第 " + currentRow + " 行：制单人代码查到的制单人部门编码为空！");
                             }
 
-                            if (createByList != null && !createByList.isEmpty() && !createByList.get(0).getDeptCode().isEmpty()) {
+                            if (createByList != null && !createByList.isEmpty() && !createByList.get(0).getId().isEmpty()) {
                                 dto.setDeptId(createByList.get(0).getDeptCode());
                             }
 
@@ -972,10 +982,16 @@ public class SalesContractServiceImpl implements SalesContractService {
         // ==========  最终检查所有错误，如果有 → 回滚事务并返回统一信息 ==========
         if (!errors.isEmpty()) {
 
-            // 保存到错误日志表
-            ContractErrorLogEntity log = new ContractErrorLogEntity();
-            log.setErrorLog(String.join("\n", errors));
-            contractErrorLogMapper.insert(log);
+            try {
+                // 先保存错误日志
+                ContractErrorLogEntity log = new ContractErrorLogEntity();
+                log.setErrorLog(String.join("\n", errors));
+                log.setCreateDate(new Date());
+                contractErrorLogMapper.insert(log);
+            } catch (Exception logException) {
+                // 日志保存失败也不影响主流程
+                System.err.println("保存错误日志失败: " + logException.getMessage());
+            }
 
             // 抛异常，触发事务回滚
             throw new RuntimeException("Excel 导入出现以下错误：\n" + String.join("\n", errors));

src/main/resources/mapper/CustCtrlMapper.xml

@@ -130,8 +130,8 @@
         SELECT
             t.fno,
             t.cpny,
-            t.deptname,
-            t.deptcode
+            t.deptname as deptName,
+            t.deptcode as deptCode
         FROM (
                  SELECT DISTINCT
                      c.fno,

src/main/resources/mapper/SysUserMapper.xml

@@ -36,7 +36,7 @@
 
     </select>
     <select id="selectByCreateBy" resultType="com.example.backend.entity.common.SysUser">
-        select a.DEPT_CODE, a.DEPT_NAME,c.user_desc,c.USER_CODE
+        select a.id,a.dept_code, 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