Merge remote-tracking branch 'origin/master'

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerContractExpirationController.java

@@ -0,0 +1,140 @@
+package com.sundot.airport.web.controller.ledger;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.common.core.domain.entity.SysDictData;
+import com.sundot.airport.ledger.dto.LedgerContractExpirationImportTemplateDTO;
+import com.sundot.airport.ledger.utils.LedgerContractExcelExportUtil;
+import com.sundot.airport.ledger.utils.LedgerContractExcelImportUtil;
+import com.sundot.airport.system.service.ISysDictDataService;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.ledger.domain.LedgerContractExpiration;
+import com.sundot.airport.ledger.service.ILedgerContractExpirationService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 合同到期Controller
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+@RestController
+@RequestMapping("/ledger/contract")
+public class LedgerContractExpirationController extends BaseController {
+    @Autowired
+    private ILedgerContractExpirationService ledgerContractExpirationService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
+    /**
+     * 查询合同到期列表
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contract:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LedgerContractExpiration ledgerContractExpiration) {
+        startPage();
+        List<LedgerContractExpiration> list = ledgerContractExpirationService.selectLedgerContractExpirationList(ledgerContractExpiration);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出合同到期列表
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contract:export')")
+    @Log(title = "合同到期", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LedgerContractExpiration ledgerContractExpiration) {
+        List<LedgerContractExpiration> list = ledgerContractExpirationService.selectLedgerContractExpirationList(ledgerContractExpiration);
+        // 用工形式
+        SysDictData sexDictData = new SysDictData();
+        sexDictData.setDictType("employment_type");
+        List<SysDictData> sexDictDataList = sysDictDataService.selectDictDataList(sexDictData);
+        Map<String, String> sexDictDataMap = sexDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
+        LedgerContractExcelExportUtil.exportExcel(response, list, "合同到期数据", sexDictDataMap);
+    }
+
+    /**
+     * 获取合同到期详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contract:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(ledgerContractExpirationService.selectLedgerContractExpirationById(id));
+    }
+
+    /**
+     * 新增合同到期
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contract:add')")
+    @Log(title = "合同到期", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LedgerContractExpiration ledgerContractExpiration) {
+        ledgerContractExpiration.setCreateBy(getUsername());
+        return toAjax(ledgerContractExpirationService.insertLedgerContractExpiration(ledgerContractExpiration));
+    }
+
+    /**
+     * 修改合同到期
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contract:edit')")
+    @Log(title = "合同到期", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LedgerContractExpiration ledgerContractExpiration) {
+        ledgerContractExpiration.setUpdateBy(getUsername());
+        return toAjax(ledgerContractExpirationService.updateLedgerContractExpiration(ledgerContractExpiration));
+    }
+
+    /**
+     * 删除合同到期
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contract:remove')")
+    @Log(title = "合同到期", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(ledgerContractExpirationService.deleteLedgerContractExpirationByIds(ids));
+    }
+
+    /**
+     * 导入数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:excluded:import')")
+    @Log(title = "导入数据列表", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
+        // 使用自定义工具类解析Excel,支持动态合同起止日期列
+        Workbook workbook = WorkbookFactory.create(file.getInputStream());
+        List<LedgerContractExpiration> list = LedgerContractExcelImportUtil.parseContractExcel(workbook);
+        workbook.close();
+        String message = ledgerContractExpirationService.importData(list, updateSupport);
+        return success(message);
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<LedgerContractExpirationImportTemplateDTO> util = new ExcelUtil<>(LedgerContractExpirationImportTemplateDTO.class);
+        util.importTemplateExcel(response, "合同到期数据导入模板");
+    }
+}

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerContractExpirationDetailController.java

@@ -0,0 +1,100 @@
+package com.sundot.airport.web.controller.ledger;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.sundot.airport.common.annotation.Log;
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.common.enums.BusinessType;
+import com.sundot.airport.ledger.domain.LedgerContractExpirationDetail;
+import com.sundot.airport.ledger.service.ILedgerContractExpirationDetailService;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.common.core.page.TableDataInfo;
+
+/**
+ * 合同到期明细Controller
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+@RestController
+@RequestMapping("/ledger/contractDetail")
+public class LedgerContractExpirationDetailController extends BaseController {
+    @Autowired
+    private ILedgerContractExpirationDetailService ledgerContractExpirationDetailService;
+
+    /**
+     * 查询合同到期明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contractDetail:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(LedgerContractExpirationDetail ledgerContractExpirationDetail) {
+        startPage();
+        List<LedgerContractExpirationDetail> list = ledgerContractExpirationDetailService.selectLedgerContractExpirationDetailList(ledgerContractExpirationDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出合同到期明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contractDetail:export')")
+    @Log(title = "合同到期明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, LedgerContractExpirationDetail ledgerContractExpirationDetail) {
+        List<LedgerContractExpirationDetail> list = ledgerContractExpirationDetailService.selectLedgerContractExpirationDetailList(ledgerContractExpirationDetail);
+        ExcelUtil<LedgerContractExpirationDetail> util = new ExcelUtil<LedgerContractExpirationDetail>(LedgerContractExpirationDetail.class);
+        util.exportExcel(response, list, "合同到期明细数据");
+    }
+
+    /**
+     * 获取合同到期明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contractDetail:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(ledgerContractExpirationDetailService.selectLedgerContractExpirationDetailById(id));
+    }
+
+    /**
+     * 新增合同到期明细
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contractDetail:add')")
+    @Log(title = "合同到期明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody LedgerContractExpirationDetail ledgerContractExpirationDetail) {
+        ledgerContractExpirationDetail.setCreateBy(getUsername());
+        return toAjax(ledgerContractExpirationDetailService.insertLedgerContractExpirationDetail(ledgerContractExpirationDetail));
+    }
+
+    /**
+     * 修改合同到期明细
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contractDetail:edit')")
+    @Log(title = "合同到期明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody LedgerContractExpirationDetail ledgerContractExpirationDetail) {
+        ledgerContractExpirationDetail.setUpdateBy(getUsername());
+        return toAjax(ledgerContractExpirationDetailService.updateLedgerContractExpirationDetail(ledgerContractExpirationDetail));
+    }
+
+    /**
+     * 删除合同到期明细
+     */
+    @PreAuthorize("@ss.hasPermi('ledger:contractDetail:remove')")
+    @Log(title = "合同到期明细", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(ledgerContractExpirationDetailService.deleteLedgerContractExpirationDetailByIds(ids));
+    }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerContractExpiration.java

@@ -0,0 +1,249 @@
+package com.sundot.airport.ledger.domain;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sundot.airport.common.annotation.Excel;
+import com.sundot.airport.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 合同到期对象 ledger_contract_expiration
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+@TableName("ledger_contract_expiration")
+public class LedgerContractExpiration extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 租户号 */
+    private String tenantId;
+
+    /** 乐观锁 */
+    private Integer revision;
+
+    /** 主键 */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 用户ID */
+    private Long userId;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 合同名称 */
+    @Excel(name = "合同名称", type = Excel.Type.EXPORT)
+    private String contractName;
+
+    /** 合同开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同开始日期", width = 30, dateFormat = "yyyy-MM-dd", type = Excel.Type.EXPORT)
+    private Date contractStartDate;
+
+    /** 合同结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同结束日期", width = 30, dateFormat = "yyyy-MM-dd", type = Excel.Type.EXPORT)
+    private Date contractEndDate;
+
+    /** 大队ID */
+    private Long brigadeId;
+
+    /** 大队名称 */
+    @Excel(name = "大队名称", type = Excel.Type.EXPORT)
+    private String brigadeName;
+
+    /** 用工形式 */
+    @Excel(name = "用工形式", readConverterExp = "DISPATCHED_WORKER=派遣工,REGULAR_EMPLOYEE=正式工,INTERN=实习生", combo = "派遣工,正式工,实习生", type = Excel.Type.EXPORT)
+    private String employmentType;
+
+    /** 合同开始日期-查询开始日期 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractStartDateQueryStartDate;
+
+    /** 合同开始日期-查询结束日期 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractStartDateQueryEndDate;
+
+    /** 合同结束日期-查询开始日期 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractEndDateQueryStartDate;
+
+    /** 合同结束日期-查询结束日期 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date contractEndDateQueryEndDate;
+
+    /** 合同到期明细列表 */
+    @TableField(exist = false)
+    private List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList;
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setRevision(Integer revision) {
+        this.revision = revision;
+    }
+
+    public Integer getRevision() {
+        return revision;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setContractName(String contractName) {
+        this.contractName = contractName;
+    }
+
+    public String getContractName() {
+        return contractName;
+    }
+
+    public void setContractStartDate(Date contractStartDate) {
+        this.contractStartDate = contractStartDate;
+    }
+
+    public Date getContractStartDate() {
+        return contractStartDate;
+    }
+
+    public void setContractEndDate(Date contractEndDate) {
+        this.contractEndDate = contractEndDate;
+    }
+
+    public Date getContractEndDate() {
+        return contractEndDate;
+    }
+
+    public void setBrigadeId(Long brigadeId) {
+        this.brigadeId = brigadeId;
+    }
+
+    public Long getBrigadeId() {
+        return brigadeId;
+    }
+
+    public void setBrigadeName(String brigadeName) {
+        this.brigadeName = brigadeName;
+    }
+
+    public String getBrigadeName() {
+        return brigadeName;
+    }
+
+    public void setEmploymentType(String employmentType) {
+        this.employmentType = employmentType;
+    }
+
+    public String getEmploymentType() {
+        return employmentType;
+    }
+
+    public Date getContractStartDateQueryStartDate() {
+        return contractStartDateQueryStartDate;
+    }
+
+    public void setContractStartDateQueryStartDate(Date contractStartDateQueryStartDate) {
+        this.contractStartDateQueryStartDate = contractStartDateQueryStartDate;
+    }
+
+    public Date getContractStartDateQueryEndDate() {
+        return contractStartDateQueryEndDate;
+    }
+
+    public void setContractStartDateQueryEndDate(Date contractStartDateQueryEndDate) {
+        this.contractStartDateQueryEndDate = contractStartDateQueryEndDate;
+    }
+
+    public Date getContractEndDateQueryStartDate() {
+        return contractEndDateQueryStartDate;
+    }
+
+    public void setContractEndDateQueryStartDate(Date contractEndDateQueryStartDate) {
+        this.contractEndDateQueryStartDate = contractEndDateQueryStartDate;
+    }
+
+    public Date getContractEndDateQueryEndDate() {
+        return contractEndDateQueryEndDate;
+    }
+
+    public void setContractEndDateQueryEndDate(Date contractEndDateQueryEndDate) {
+        this.contractEndDateQueryEndDate = contractEndDateQueryEndDate;
+    }
+
+    public List<LedgerContractExpirationDetail> getLedgerContractExpirationDetailList() {
+        return ledgerContractExpirationDetailList;
+    }
+
+    public void setLedgerContractExpirationDetailList(List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList) {
+        this.ledgerContractExpirationDetailList = ledgerContractExpirationDetailList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("tenantId", getTenantId())
+                .append("revision", getRevision())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("id", getId())
+                .append("userId", getUserId())
+                .append("userName", getUserName())
+                .append("contractName", getContractName())
+                .append("contractStartDate", getContractStartDate())
+                .append("contractEndDate", getContractEndDate())
+                .append("brigadeId", getBrigadeId())
+                .append("brigadeName", getBrigadeName())
+                .append("employmentType", getEmploymentType())
+                .append("ledgerContractExpirationDetailList", getLedgerContractExpirationDetailList())
+                .toString();
+    }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerContractExpirationDetail.java

@@ -0,0 +1,128 @@
+package com.sundot.airport.ledger.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.sundot.airport.common.annotation.Excel;
+import com.sundot.airport.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 合同到期明细对象 ledger_contract_expiration_detail
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+@TableName("ledger_contract_expiration_detail")
+public class LedgerContractExpirationDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 租户号 */
+    private String tenantId;
+
+    /** 乐观锁 */
+    private Integer revision;
+
+    /** 主键 */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 来源ID */
+    @Excel(name = "来源ID")
+    private Long sourceId;
+
+    /** 合同名称 */
+    @Excel(name = "合同名称")
+    private String contractName;
+
+    /** 合同开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同开始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date contractStartDate;
+
+    /** 合同结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "合同结束日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date contractEndDate;
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setRevision(Integer revision) {
+        this.revision = revision;
+    }
+
+    public Integer getRevision() {
+        return revision;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setSourceId(Long sourceId) {
+        this.sourceId = sourceId;
+    }
+
+    public Long getSourceId() {
+        return sourceId;
+    }
+
+    public void setContractName(String contractName) {
+        this.contractName = contractName;
+    }
+
+    public String getContractName() {
+        return contractName;
+    }
+
+    public void setContractStartDate(Date contractStartDate) {
+        this.contractStartDate = contractStartDate;
+    }
+
+    public Date getContractStartDate() {
+        return contractStartDate;
+    }
+
+    public void setContractEndDate(Date contractEndDate) {
+        this.contractEndDate = contractEndDate;
+    }
+
+    public Date getContractEndDate() {
+        return contractEndDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("tenantId", getTenantId())
+                .append("revision", getRevision())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .append("id", getId())
+                .append("sourceId", getSourceId())
+                .append("contractName", getContractName())
+                .append("contractStartDate", getContractStartDate())
+                .append("contractEndDate", getContractEndDate())
+                .toString();
+    }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/dto/LedgerContractExpirationImportTemplateDTO.java

@@ -0,0 +1,41 @@
+package com.sundot.airport.ledger.dto;
+
+import com.sundot.airport.common.annotation.Excel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 合同到期导入模板对象
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+@Data
+public class LedgerContractExpirationImportTemplateDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 合同1起止日期 */
+    @Excel(name = "合同1起止日期")
+    private String contract1StartEndDate;
+
+    /** 合同2起止日期 */
+    @Excel(name = "合同2起止日期")
+    private String contract2StartEndDate;
+
+    /** 合同3起止日期 */
+    @Excel(name = "合同3起止日期")
+    private String contract3StartEndDate;
+
+    /** 合同4起止日期 */
+    @Excel(name = "合同4起止日期")
+    private String contract4StartEndDate;
+
+    /** 合同5起止日期 */
+    @Excel(name = "合同5起止日期")
+    private String contract5StartEndDate;
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/LedgerContractExpirationDetailMapper.java

@@ -0,0 +1,62 @@
+package com.sundot.airport.ledger.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sundot.airport.ledger.domain.LedgerContractExpirationDetail;
+
+/**
+ * 合同到期明细Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+public interface LedgerContractExpirationDetailMapper extends BaseMapper<LedgerContractExpirationDetail> {
+    /**
+     * 查询合同到期明细
+     *
+     * @param id 合同到期明细主键
+     * @return 合同到期明细
+     */
+    public LedgerContractExpirationDetail selectLedgerContractExpirationDetailById(Long id);
+
+    /**
+     * 查询合同到期明细列表
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 合同到期明细集合
+     */
+    public List<LedgerContractExpirationDetail> selectLedgerContractExpirationDetailList(LedgerContractExpirationDetail ledgerContractExpirationDetail);
+
+    /**
+     * 新增合同到期明细
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 结果
+     */
+    public int insertLedgerContractExpirationDetail(LedgerContractExpirationDetail ledgerContractExpirationDetail);
+
+    /**
+     * 修改合同到期明细
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 结果
+     */
+    public int updateLedgerContractExpirationDetail(LedgerContractExpirationDetail ledgerContractExpirationDetail);
+
+    /**
+     * 删除合同到期明细
+     *
+     * @param id 合同到期明细主键
+     * @return 结果
+     */
+    public int deleteLedgerContractExpirationDetailById(Long id);
+
+    /**
+     * 批量删除合同到期明细
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLedgerContractExpirationDetailByIds(Long[] ids);
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/LedgerContractExpirationMapper.java

@@ -0,0 +1,62 @@
+package com.sundot.airport.ledger.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sundot.airport.ledger.domain.LedgerContractExpiration;
+
+/**
+ * 合同到期Mapper接口
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+public interface LedgerContractExpirationMapper extends BaseMapper<LedgerContractExpiration> {
+    /**
+     * 查询合同到期
+     *
+     * @param id 合同到期主键
+     * @return 合同到期
+     */
+    public LedgerContractExpiration selectLedgerContractExpirationById(Long id);
+
+    /**
+     * 查询合同到期列表
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 合同到期集合
+     */
+    public List<LedgerContractExpiration> selectLedgerContractExpirationList(LedgerContractExpiration ledgerContractExpiration);
+
+    /**
+     * 新增合同到期
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 结果
+     */
+    public int insertLedgerContractExpiration(LedgerContractExpiration ledgerContractExpiration);
+
+    /**
+     * 修改合同到期
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 结果
+     */
+    public int updateLedgerContractExpiration(LedgerContractExpiration ledgerContractExpiration);
+
+    /**
+     * 删除合同到期
+     *
+     * @param id 合同到期主键
+     * @return 结果
+     */
+    public int deleteLedgerContractExpirationById(Long id);
+
+    /**
+     * 批量删除合同到期
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteLedgerContractExpirationByIds(Long[] ids);
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerContractExpirationDetailService.java

@@ -0,0 +1,62 @@
+package com.sundot.airport.ledger.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sundot.airport.ledger.domain.LedgerContractExpirationDetail;
+
+/**
+ * 合同到期明细Service接口
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+public interface ILedgerContractExpirationDetailService extends IService<LedgerContractExpirationDetail> {
+    /**
+     * 查询合同到期明细
+     *
+     * @param id 合同到期明细主键
+     * @return 合同到期明细
+     */
+    public LedgerContractExpirationDetail selectLedgerContractExpirationDetailById(Long id);
+
+    /**
+     * 查询合同到期明细列表
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 合同到期明细集合
+     */
+    public List<LedgerContractExpirationDetail> selectLedgerContractExpirationDetailList(LedgerContractExpirationDetail ledgerContractExpirationDetail);
+
+    /**
+     * 新增合同到期明细
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 结果
+     */
+    public int insertLedgerContractExpirationDetail(LedgerContractExpirationDetail ledgerContractExpirationDetail);
+
+    /**
+     * 修改合同到期明细
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 结果
+     */
+    public int updateLedgerContractExpirationDetail(LedgerContractExpirationDetail ledgerContractExpirationDetail);
+
+    /**
+     * 批量删除合同到期明细
+     *
+     * @param ids 需要删除的合同到期明细主键集合
+     * @return 结果
+     */
+    public int deleteLedgerContractExpirationDetailByIds(Long[] ids);
+
+    /**
+     * 删除合同到期明细信息
+     *
+     * @param id 合同到期明细主键
+     * @return 结果
+     */
+    public int deleteLedgerContractExpirationDetailById(Long id);
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerContractExpirationService.java

@@ -0,0 +1,71 @@
+package com.sundot.airport.ledger.service;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sundot.airport.ledger.domain.LedgerContractExpiration;
+
+/**
+ * 合同到期Service接口
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+public interface ILedgerContractExpirationService extends IService<LedgerContractExpiration> {
+    /**
+     * 查询合同到期
+     *
+     * @param id 合同到期主键
+     * @return 合同到期
+     */
+    public LedgerContractExpiration selectLedgerContractExpirationById(Long id);
+
+    /**
+     * 查询合同到期列表
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 合同到期集合
+     */
+    public List<LedgerContractExpiration> selectLedgerContractExpirationList(LedgerContractExpiration ledgerContractExpiration);
+
+    /**
+     * 新增合同到期
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 结果
+     */
+    public int insertLedgerContractExpiration(LedgerContractExpiration ledgerContractExpiration);
+
+    /**
+     * 修改合同到期
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 结果
+     */
+    public int updateLedgerContractExpiration(LedgerContractExpiration ledgerContractExpiration);
+
+    /**
+     * 批量删除合同到期
+     *
+     * @param ids 需要删除的合同到期主键集合
+     * @return 结果
+     */
+    public int deleteLedgerContractExpirationByIds(Long[] ids);
+
+    /**
+     * 删除合同到期信息
+     *
+     * @param id 合同到期主键
+     * @return 结果
+     */
+    public int deleteLedgerContractExpirationById(Long id);
+
+    /**
+     * 导入数据列表
+     *
+     * @param list          数据列表
+     * @param updateSupport 是否更新支持
+     * @return 导入结果信息
+     */
+    public String importData(List<LedgerContractExpiration> list, boolean updateSupport);
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerContractExpirationDetailServiceImpl.java

@@ -0,0 +1,91 @@
+package com.sundot.airport.ledger.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sundot.airport.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.sundot.airport.ledger.mapper.LedgerContractExpirationDetailMapper;
+import com.sundot.airport.ledger.domain.LedgerContractExpirationDetail;
+import com.sundot.airport.ledger.service.ILedgerContractExpirationDetailService;
+
+/**
+ * 合同到期明细Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+@Service
+public class LedgerContractExpirationDetailServiceImpl extends ServiceImpl<LedgerContractExpirationDetailMapper, LedgerContractExpirationDetail> implements ILedgerContractExpirationDetailService {
+    @Autowired
+    private LedgerContractExpirationDetailMapper ledgerContractExpirationDetailMapper;
+
+    /**
+     * 查询合同到期明细
+     *
+     * @param id 合同到期明细主键
+     * @return 合同到期明细
+     */
+    @Override
+    public LedgerContractExpirationDetail selectLedgerContractExpirationDetailById(Long id) {
+        return ledgerContractExpirationDetailMapper.selectLedgerContractExpirationDetailById(id);
+    }
+
+    /**
+     * 查询合同到期明细列表
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 合同到期明细
+     */
+    @Override
+    public List<LedgerContractExpirationDetail> selectLedgerContractExpirationDetailList(LedgerContractExpirationDetail ledgerContractExpirationDetail) {
+        return ledgerContractExpirationDetailMapper.selectLedgerContractExpirationDetailList(ledgerContractExpirationDetail);
+    }
+
+    /**
+     * 新增合同到期明细
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 结果
+     */
+    @Override
+    public int insertLedgerContractExpirationDetail(LedgerContractExpirationDetail ledgerContractExpirationDetail) {
+        ledgerContractExpirationDetail.setCreateTime(DateUtils.getNowDate());
+        return ledgerContractExpirationDetailMapper.insertLedgerContractExpirationDetail(ledgerContractExpirationDetail);
+    }
+
+    /**
+     * 修改合同到期明细
+     *
+     * @param ledgerContractExpirationDetail 合同到期明细
+     * @return 结果
+     */
+    @Override
+    public int updateLedgerContractExpirationDetail(LedgerContractExpirationDetail ledgerContractExpirationDetail) {
+        ledgerContractExpirationDetail.setUpdateTime(DateUtils.getNowDate());
+        return ledgerContractExpirationDetailMapper.updateLedgerContractExpirationDetail(ledgerContractExpirationDetail);
+    }
+
+    /**
+     * 批量删除合同到期明细
+     *
+     * @param ids 需要删除的合同到期明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLedgerContractExpirationDetailByIds(Long[] ids) {
+        return ledgerContractExpirationDetailMapper.deleteLedgerContractExpirationDetailByIds(ids);
+    }
+
+    /**
+     * 删除合同到期明细信息
+     *
+     * @param id 合同到期明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLedgerContractExpirationDetailById(Long id) {
+        return ledgerContractExpirationDetailMapper.deleteLedgerContractExpirationDetailById(id);
+    }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerContractExpirationServiceImpl.java

@@ -0,0 +1,303 @@
+package com.sundot.airport.ledger.service.impl;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.common.enums.DeptTypeEnum;
+import com.sundot.airport.common.exception.ServiceException;
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.ledger.domain.LedgerContractExpirationDetail;
+import com.sundot.airport.ledger.service.ILedgerContractExpirationDetailService;
+import com.sundot.airport.system.service.ISysDeptService;
+import com.sundot.airport.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.sundot.airport.ledger.mapper.LedgerContractExpirationMapper;
+import com.sundot.airport.ledger.domain.LedgerContractExpiration;
+import com.sundot.airport.ledger.service.ILedgerContractExpirationService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 合同到期Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2026-06-30
+ */
+@Service
+public class LedgerContractExpirationServiceImpl extends ServiceImpl<LedgerContractExpirationMapper, LedgerContractExpiration> implements ILedgerContractExpirationService {
+    @Autowired
+    private LedgerContractExpirationMapper ledgerContractExpirationMapper;
+    @Autowired
+    private ILedgerContractExpirationDetailService ledgerContractExpirationDetailService;
+    @Autowired
+    private ISysDeptService sysDeptService;
+    @Autowired
+    private ISysUserService sysUserService;
+
+    /**
+     * 查询合同到期
+     *
+     * @param id 合同到期主键
+     * @return 合同到期
+     */
+    @Override
+    public LedgerContractExpiration selectLedgerContractExpirationById(Long id) {
+        LedgerContractExpiration result = ledgerContractExpirationMapper.selectLedgerContractExpirationById(id);
+        LambdaQueryWrapper<LedgerContractExpirationDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(LedgerContractExpirationDetail::getSourceId, id);
+        List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList = ledgerContractExpirationDetailService.getBaseMapper().selectList(wrapper);
+        result.setLedgerContractExpirationDetailList(ledgerContractExpirationDetailList);
+        return result;
+    }
+
+    /**
+     * 查询合同到期列表
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 合同到期
+     */
+    @Override
+    public List<LedgerContractExpiration> selectLedgerContractExpirationList(LedgerContractExpiration ledgerContractExpiration) {
+        List<LedgerContractExpiration> result = ledgerContractExpirationMapper.selectLedgerContractExpirationList(ledgerContractExpiration);
+        if (CollUtil.isNotEmpty(result)) {
+            List<Long> idList = result.stream().map(LedgerContractExpiration::getId).collect(Collectors.toList());
+            LambdaQueryWrapper<LedgerContractExpirationDetail> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(LedgerContractExpirationDetail::getSourceId, idList);
+            List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList = ledgerContractExpirationDetailService.getBaseMapper().selectList(wrapper);
+            if (CollUtil.isNotEmpty(ledgerContractExpirationDetailList)) {
+                Map<Long, List<LedgerContractExpirationDetail>> groupingByMap = ledgerContractExpirationDetailList.stream().collect(Collectors.groupingBy(LedgerContractExpirationDetail::getSourceId));
+                result.forEach(item -> {
+                    item.setLedgerContractExpirationDetailList(groupingByMap.get(item.getId()));
+                });
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 新增合同到期
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 结果
+     */
+    @Override
+    public int insertLedgerContractExpiration(LedgerContractExpiration ledgerContractExpiration) {
+        ledgerContractExpiration.setCreateTime(DateUtils.getNowDate());
+        int result = ledgerContractExpirationMapper.insertLedgerContractExpiration(ledgerContractExpiration);
+        if (CollUtil.isNotEmpty(ledgerContractExpiration.getLedgerContractExpirationDetailList())) {
+            List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList = ledgerContractExpiration.getLedgerContractExpirationDetailList();
+            ledgerContractExpirationDetailList.sort(Comparator.comparing(LedgerContractExpirationDetail::getContractEndDate));
+            String contractName = "合同" + (ledgerContractExpirationDetailList.size() - 1);
+            LedgerContractExpirationDetail ledgerContractExpirationDetail = ledgerContractExpirationDetailList.get(ledgerContractExpirationDetailList.size() - 1);
+            ledgerContractExpiration.setContractName(contractName);
+            ledgerContractExpiration.setContractStartDate(ledgerContractExpirationDetail.getContractStartDate());
+            ledgerContractExpiration.setContractEndDate(ledgerContractExpirationDetail.getContractEndDate());
+            result = ledgerContractExpirationMapper.updateLedgerContractExpiration(ledgerContractExpiration);
+            ledgerContractExpirationDetailList.forEach(item -> {
+                item.setCreateBy(ledgerContractExpiration.getCreateBy());
+                item.setCreateTime(DateUtils.getNowDate());
+                item.setSourceId(ledgerContractExpiration.getId());
+            });
+            ledgerContractExpirationDetailService.saveBatch(ledgerContractExpirationDetailList);
+        }
+        return result;
+    }
+
+    /**
+     * 修改合同到期
+     *
+     * @param ledgerContractExpiration 合同到期
+     * @return 结果
+     */
+    @Override
+    public int updateLedgerContractExpiration(LedgerContractExpiration ledgerContractExpiration) {
+        ledgerContractExpiration.setUpdateTime(DateUtils.getNowDate());
+        int result = ledgerContractExpirationMapper.updateLedgerContractExpiration(ledgerContractExpiration);
+        LambdaQueryWrapper<LedgerContractExpirationDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(LedgerContractExpirationDetail::getSourceId, ledgerContractExpiration.getId());
+        List<LedgerContractExpirationDetail> ledgerContractExpirationDetailListOld = ledgerContractExpirationDetailService.getBaseMapper().selectList(wrapper);
+        ledgerContractExpirationDetailService.removeBatchByIds(ledgerContractExpirationDetailListOld);
+        if (CollUtil.isNotEmpty(ledgerContractExpiration.getLedgerContractExpirationDetailList())) {
+            List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList = ledgerContractExpiration.getLedgerContractExpirationDetailList();
+            ledgerContractExpirationDetailList.sort(Comparator.comparing(LedgerContractExpirationDetail::getContractEndDate));
+            String contractName = "合同" + (ledgerContractExpirationDetailList.size() - 1);
+            LedgerContractExpirationDetail ledgerContractExpirationDetail = ledgerContractExpirationDetailList.get(ledgerContractExpirationDetailList.size() - 1);
+            ledgerContractExpiration.setContractName(contractName);
+            ledgerContractExpiration.setContractStartDate(ledgerContractExpirationDetail.getContractStartDate());
+            ledgerContractExpiration.setContractEndDate(ledgerContractExpirationDetail.getContractEndDate());
+            result = ledgerContractExpirationMapper.updateLedgerContractExpiration(ledgerContractExpiration);
+            ledgerContractExpirationDetailList.forEach(item -> {
+                item.setCreateBy(ledgerContractExpiration.getCreateBy());
+                item.setCreateTime(DateUtils.getNowDate());
+                item.setSourceId(ledgerContractExpiration.getId());
+            });
+            ledgerContractExpirationDetailService.saveBatch(ledgerContractExpirationDetailList);
+        }
+        return result;
+    }
+
+    /**
+     * 批量删除合同到期
+     *
+     * @param ids 需要删除的合同到期主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLedgerContractExpirationByIds(Long[] ids) {
+        int result = ledgerContractExpirationMapper.deleteLedgerContractExpirationByIds(ids);
+        for (Long id : ids) {
+            LambdaQueryWrapper<LedgerContractExpirationDetail> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(LedgerContractExpirationDetail::getSourceId, id);
+            List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList = ledgerContractExpirationDetailService.getBaseMapper().selectList(wrapper);
+            ledgerContractExpirationDetailService.removeBatchByIds(ledgerContractExpirationDetailList);
+        }
+        return result;
+    }
+
+    /**
+     * 删除合同到期信息
+     *
+     * @param id 合同到期主键
+     * @return 结果
+     */
+    @Override
+    public int deleteLedgerContractExpirationById(Long id) {
+        int result = ledgerContractExpirationMapper.deleteLedgerContractExpirationById(id);
+        LambdaQueryWrapper<LedgerContractExpirationDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(LedgerContractExpirationDetail::getSourceId, id);
+        List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList = ledgerContractExpirationDetailService.getBaseMapper().selectList(wrapper);
+        ledgerContractExpirationDetailService.removeBatchByIds(ledgerContractExpirationDetailList);
+        return result;
+    }
+
+    /**
+     * 导入数据
+     *
+     * @param list            数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String importData(List<LedgerContractExpiration> list, boolean isUpdateSupport) {
+        if (CollUtil.isEmpty(list)) {
+            throw new ServiceException("导入数据不能为空！");
+        }
+
+        // 用户
+        List<SysUser> sysUserListAll = sysUserService.selectUserAll();
+        Map<String, Long> sysUserMap = sysUserListAll.stream().collect(Collectors.toMap(SysUser::getNickName, SysUser::getUserId, (oldValue, newValue) -> newValue));
+
+        // 用工形式
+        Map<Long, String> userIdEmploymentTypeMap = sysUserListAll.stream().filter(sysUser -> StrUtil.isNotEmpty(sysUser.getEmploymentType())).collect(Collectors.toMap(SysUser::getUserId, SysUser::getEmploymentType));
+
+        // 大队
+        Map<Long, Long> userIdBrigadeIdMap = new HashMap<>();
+        Map<Long, String> brigadeIdNameMap = new HashMap<>();
+        SysDept sysDeptQuery = new SysDept();
+        sysDeptQuery.setStatus("0");
+        sysDeptQuery.setDelFlag("0");
+        sysDeptQuery.setDeptType(DeptTypeEnum.BRIGADE.getCode());
+        List<SysDept> sysDeptList = sysDeptService.selectDeptInfoAll(sysDeptQuery);
+        sysDeptList.forEach(dept -> {
+            brigadeIdNameMap.put(dept.getDeptId(), dept.getDeptName());
+            List<SysUser> sysUserList = sysUserService.selectUserByDeptId(dept.getDeptId());
+            sysUserList.forEach(sysUser -> {
+                userIdBrigadeIdMap.put(sysUser.getUserId(), dept.getDeptId());
+            });
+        });
+
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+
+        for (LedgerContractExpiration data : list) {
+            // 根据名称填充ID字段
+            fillIdsByName(data, sysUserMap, userIdEmploymentTypeMap, userIdBrigadeIdMap, brigadeIdNameMap);
+            try {
+                // 必填字段校验
+                if (ObjUtil.isNull(data.getUserName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、用户名称【" + data.getUserName() + "】用户名称不能为空");
+                    continue;
+                }
+
+                // 数据准确性校验
+                if (ObjUtil.isNull(data.getUserId())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、用户名称【" + data.getUserName() + "】用户数据错误");
+                    continue;
+                }
+
+                // 查询是否已存在（根据【用户ID】唯一）
+                LedgerContractExpiration queryParam = new LedgerContractExpiration();
+                queryParam.setUserId(data.getUserId());
+                List<LedgerContractExpiration> existingList = ledgerContractExpirationMapper.selectLedgerContractExpirationList(queryParam);
+
+                if (CollUtil.isEmpty(existingList)) {
+                    data.setCreateTime(DateUtils.getNowDate());
+                    insertLedgerContractExpiration(data);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、用户名称【" + data.getUserName() + "】导入成功");
+                } else if (isUpdateSupport) {
+                    LedgerContractExpiration old = existingList.get(0);
+                    data.setId(old.getId());
+                    data.setUpdateTime(DateUtils.getNowDate());
+                    updateLedgerContractExpiration(data);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、用户名称【" + data.getUserName() + "】更新成功");
+                } else {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、用户名称【" + data.getUserName() + "】已存在");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、用户名称【" + data.getUserName() + "】导入失败：";
+                failureMsg.append(msg + e.getMessage());
+            }
+        }
+
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    /**
+     * 根据名称填充ID字段
+     *
+     * @param data 速率数据
+     */
+    private void fillIdsByName(LedgerContractExpiration data, Map<String, Long> sysUserMap, Map<Long, String> userIdEmploymentTypeMap, Map<Long, Long> userIdBrigadeIdMap, Map<Long, String> brigadeIdNameMap) {
+        // 用户ID
+        if (ObjUtil.isNotNull(data.getUserName())) {
+            data.setUserId(sysUserMap.get(data.getUserName()));
+        }
+        // 用工形式
+        if (ObjUtil.isNotNull(data.getUserId())) {
+            data.setEmploymentType(userIdEmploymentTypeMap.get(data.getUserId()));
+        }
+        // 大队ID
+        if (ObjUtil.isNotNull(data.getUserId())) {
+            data.setBrigadeId(userIdBrigadeIdMap.get(data.getUserId()));
+        }
+        // 大队名称
+        if (ObjUtil.isNotNull(data.getBrigadeId())) {
+            data.setBrigadeName(brigadeIdNameMap.get(data.getBrigadeId()));
+        }
+    }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/utils/LedgerContractExcelExportUtil.java

@@ -0,0 +1,144 @@
+package com.sundot.airport.ledger.utils;
+
+import com.sundot.airport.common.utils.DateUtils;
+import com.sundot.airport.ledger.domain.LedgerContractExpiration;
+import com.sundot.airport.ledger.domain.LedgerContractExpirationDetail;
+import lombok.SneakyThrows;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 合同到期Excel导出工具类
+ *
+ * @author ruoyi
+ * @date 2026-06-29
+ */
+public class LedgerContractExcelExportUtil {
+
+    /**
+     * 导出数据列表
+     *
+     * @param response 响应对象
+     * @param list     数据列表
+     * @param sheetName 工作表名称
+     */
+    @SneakyThrows
+    public static void exportExcel(HttpServletResponse response, List<LedgerContractExpiration> list, String sheetName, Map<String, String> sexDictDataMap) {
+        // 1. 获取所有合同名
+        Set<String> contractNameSet = new LinkedHashSet<>();
+        for (LedgerContractExpiration e : list) {
+            if (e.getLedgerContractExpirationDetailList() != null) {
+                e.getLedgerContractExpirationDetailList().forEach(c ->
+                        contractNameSet.add(c.getContractName())
+                );
+            }
+        }
+
+        List<String> contractNameList = new ArrayList<>(contractNameSet);
+
+        // 2. 创建 Workbook
+        SXSSFWorkbook workbook = new SXSSFWorkbook();
+        Sheet sheet = workbook.createSheet(sheetName);
+        // 3. 表头
+        CellStyle headStyle = createHeadStyle(workbook);
+        Row header = sheet.createRow(0);
+        int colIndex = 0;
+        String[] baseHeaders = {"用户名称", "大队名称", "用工形式"};
+        for (String h : baseHeaders) {
+            Cell cell = header.createCell(colIndex++);
+            cell.setCellValue(h);
+            cell.setCellStyle(headStyle);                  // ← 套样式
+        }
+
+        for (String name : contractNameList) {
+            Cell cell = header.createCell(colIndex++);
+            cell.setCellValue(name);
+            cell.setCellStyle(headStyle);
+        }
+
+        // 4. 数据行
+        int rowNum = 1;
+        for (LedgerContractExpiration entity : list) {
+
+            Row row = sheet.createRow(rowNum++);
+            colIndex = 0;
+
+            row.createCell(colIndex++).setCellValue(entity.getUserName());
+            row.createCell(colIndex++).setCellValue(entity.getBrigadeName());
+            row.createCell(colIndex++).setCellValue(sexDictDataMap.get(entity.getEmploymentType()));
+
+            // 合同 Map
+            Map<String, LedgerContractExpirationDetail> map = new HashMap<>();
+            if (entity.getLedgerContractExpirationDetailList() != null) {
+                entity.getLedgerContractExpirationDetailList().forEach(c ->
+                        map.put(c.getContractName(), c)
+                );
+            }
+
+            for (String name : contractNameList) {
+                LedgerContractExpirationDetail contract = map.get(name);
+                if (contract != null && contract.getContractStartDate() != null && contract.getContractEndDate() != null) {
+                    row.createCell(colIndex++).setCellValue(DateUtils.dateTime(contract.getContractStartDate()) + "至" + DateUtils.dateTime(contract.getContractEndDate()));
+                } else {
+                    row.createCell(colIndex++).setCellValue("");
+                }
+            }
+        }
+
+        // 5. 输出
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("合同到期数据.xlsx", "UTF-8"));
+
+        workbook.write(response.getOutputStream());
+        workbook.close();
+    }
+
+    /**
+     * 创建表头样式
+     */
+    private static CellStyle createHeadStyle(SXSSFWorkbook workbook) {
+        CellStyle style = workbook.createCellStyle();
+
+        // 对齐
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+
+        // 背景 —— 若依单体版默认 GREY_50_PERCENT
+        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+
+        // 四边细线（若依 header 也有边框）
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setBorderTop(BorderStyle.THIN);
+        style.setBorderBottom(BorderStyle.THIN);
+
+        // 字体：白色 + 加粗 + Arial 10pt（和若依 initStyles 里 fontName 对齐）
+        Font font = workbook.createFont();
+        font.setColor(IndexedColors.WHITE.getIndex());
+        font.setBold(true);
+        font.setFontName("Arial");
+        font.setFontHeightInPoints((short) 10);
+        style.setFont(font);
+
+        return style;
+    }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/utils/LedgerContractExcelImportUtil.java

@@ -0,0 +1,296 @@
+package com.sundot.airport.ledger.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.sundot.airport.common.utils.poi.ExcelUtil;
+import com.sundot.airport.ledger.domain.LedgerContractExpiration;
+import com.sundot.airport.ledger.domain.LedgerContractExpirationDetail;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 合同到期Excel导入工具类
+ * 利用现有的ExcelUtil和@Excel注解实现动态列识别
+ *
+ * @author ruoyi
+ * @date 2026-06-29
+ */
+public class LedgerContractExcelImportUtil {
+
+    // 匹配格式: "合同N起止日期" 或 "合同一起止日期"
+    // 支持阿拉伯数字(1,2,3...999)和中文数字(一,二,三...九百九十九)
+    private static final Pattern CONTRACT_DATE_PATTERN = Pattern.compile("合同([\\d]+|[一二三四五六七八九十百千]+)起止日期");
+
+    /**
+     * 解析Excel文件,提取合同到期信息和合同到期明细列表
+     * 使用现有的ExcelUtil进行基本字段解析,额外处理动态的合同起止日期列
+     *
+     * @param workbook Excel工作簿
+     * @return 合同到期信息(包含合同到期明细列表)
+     */
+    public static List<LedgerContractExpiration> parseContractExcel(Workbook workbook) {
+        try {
+            // 将Workbook转换为InputStream以便重用ExcelUtil
+            // 注意:这里我们需要重新从workbook获取输入流,所以采用另一种方式
+            // 直接使用ExcelUtil,但它不支持动态列,所以我们需要扩展
+
+            Sheet sheet = workbook.getSheetAt(0);
+            if (sheet == null) {
+                return new ArrayList<>();
+            }
+
+            // 第一步:使用ExcelUtil解析基本字段(利用@Excel注解)
+            // 由于ExcelUtil需要InputStream,我们创建一个临时的
+            java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
+            workbook.write(baos);
+            java.io.ByteArrayInputStream bais = new java.io.ByteArrayInputStream(baos.toByteArray());
+
+            ExcelUtil<LedgerContractExpiration> excelUtil = new ExcelUtil<>(LedgerContractExpiration.class);
+            List<LedgerContractExpiration> ledgerContractExpirationList = excelUtil.importExcel(bais, 0);
+            bais.close();
+
+            // 第二步:解析合同起止日期列(动态列,不在@Excel注解中)
+            parseContractDateColumns(sheet, ledgerContractExpirationList);
+
+            return ledgerContractExpirationList;
+
+        } catch (Exception e) {
+            System.err.println("解析Excel失败: " + e.getMessage());
+            e.printStackTrace();
+            return new ArrayList<>();
+        }
+    }
+
+    /**
+     * 解析合同起止日期列(动态列)
+     *
+     * @param sheet Excel工作表
+     * @param ledgerContractExpirationList 已解析的合同到期列表
+     */
+    private static void parseContractDateColumns(Sheet sheet, List<LedgerContractExpiration> ledgerContractExpirationList) {
+        if (CollUtil.isEmpty(ledgerContractExpirationList)) {
+            return;
+        }
+
+        // 读取表头,找到所有"合同N起止日期"列的位置
+        Row headerRow = sheet.getRow(0);
+        if (headerRow == null) {
+            return;
+        }
+
+        // 建立合同起止日期列映射: key=次序, value=列索引
+        Map<Integer, Integer> contractDateColumnMap = new HashMap<>();
+        for (int i = 0; i < headerRow.getLastCellNum(); i++) {
+            Cell cell = headerRow.getCell(i);
+            if (cell != null) {
+                String columnName = getCellValue(cell);
+                if (columnName != null) {
+                    // 去除所有空白字符(包括换行符\n、制表符\t、空格等)
+                    String cleanColumnName = columnName.replaceAll("\\s+", "");
+                    Matcher matcher = CONTRACT_DATE_PATTERN.matcher(cleanColumnName);
+                    if (matcher.find()) {
+                        int seq = chineseToNumber(matcher.group(1));
+                        contractDateColumnMap.put(seq, i);
+                    }
+                }
+            }
+        }
+
+        // 如果没有复审时间列,直接返回
+        if (contractDateColumnMap.isEmpty()) {
+            return;
+        }
+
+        // 为每个合同到期信息提取合同起止日期
+        for (int i = 0; i < ledgerContractExpirationList.size(); i++) {
+            LedgerContractExpiration ledgerContractExpiration = ledgerContractExpirationList.get(i);
+            // ExcelUtil已经从第1行开始读取数据,所以这里是 i+1
+            Row dataRow = sheet.getRow(i + 1);
+            if (dataRow == null) {
+                continue;
+            }
+
+            List<LedgerContractExpirationDetail> ledgerContractExpirationDetailList = new ArrayList<>();
+            for (Map.Entry<Integer, Integer> entry : contractDateColumnMap.entrySet()) {
+                int seq = entry.getKey();
+                int colIndex = entry.getValue();
+
+                Cell cell = dataRow.getCell(colIndex);
+                String contractDate = getCellValue(cell);
+                if (ObjUtil.isNotEmpty(contractDate) && contractDate.contains("至")) {
+                    LedgerContractExpirationDetail ledgerContractExpirationDetail = new LedgerContractExpirationDetail();
+                    ledgerContractExpirationDetail.setContractName("合同" + seq);
+                    Date startDate = parseDate(contractDate.split("至")[0]);
+                    Date endDate = parseDate(contractDate.split("至")[1]);
+                    ledgerContractExpirationDetail.setContractStartDate(startDate);
+                    ledgerContractExpirationDetail.setContractEndDate(endDate);
+                    ledgerContractExpirationDetailList.add(ledgerContractExpirationDetail);
+                }
+            }
+            ledgerContractExpiration.setLedgerContractExpirationDetailList(ledgerContractExpirationDetailList);
+        }
+    }
+
+    /**
+     * 获取单元格值(复用ExcelUtil的逻辑)
+     */
+    private static String getCellValue(Cell cell) {
+        if (cell == null) {
+            return null;
+        }
+
+        try {
+            switch (cell.getCellType()) {
+                case STRING:
+                    return cell.getStringCellValue().trim();
+                case NUMERIC:
+                    if (DateUtil.isCellDateFormatted(cell)) {
+                        // 日期类型格式化为 yyyy-MM-dd
+                        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd");
+                        return sdf.format(cell.getDateCellValue());
+                    } else {
+                        double value = cell.getNumericCellValue();
+                        if (value == Math.floor(value)) {
+                            return String.valueOf((long) value);
+                        } else {
+                            return String.valueOf(value);
+                        }
+                    }
+                case BOOLEAN:
+                    return String.valueOf(cell.getBooleanCellValue());
+                case FORMULA:
+                    try {
+                        // 尝试获取数值结果
+                        return String.valueOf(cell.getNumericCellValue());
+                    } catch (Exception e) {
+                        // 如果失败，尝试获取字符串结果
+                        try {
+                            return cell.getStringCellValue().trim();
+                        } catch (Exception ex) {
+                            return cell.getCellFormula();
+                        }
+                    }
+                case BLANK:
+                    return "";
+                default:
+                    return null;
+            }
+        } catch (IllegalStateException e) {
+            // 处理类型不匹配的情况：尝试以字符串方式读取
+            try {
+                return cell.getStringCellValue().trim();
+            } catch (Exception ex) {
+                // 如果还是失败，返回null
+                return null;
+            }
+        } catch (Exception e) {
+            // 其他异常也返回null
+            return null;
+        }
+    }
+
+    /**
+     * 解析日期
+     */
+    private static Date parseDate(String value) {
+        if (ObjUtil.isEmpty(value)) {
+            return null;
+        }
+
+        // 尝试解析常见日期格式
+        String[] patterns = {
+                "yyyy-MM-dd",
+                "yyyy/MM/dd",
+                "yyyy年MM月dd日",
+                "MM/dd/yyyy",
+                "MM-dd-yyyy",
+                "dd-MMM-yyyy",  // 01-十二月-2012
+                "dd/MMM/yyyy",  // 01/Dec/2012
+                "yyyy-MM-dd HH:mm:ss",
+                "yyyy/MM/dd HH:mm:ss"
+        };
+
+        for (String pattern : patterns) {
+            try {
+                java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(pattern, java.util.Locale.CHINA);
+                sdf.setLenient(false); // 严格模式
+                return sdf.parse(value);
+            } catch (Exception e) {
+                // 继续尝试下一个格式
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 中文数字转阿拉伯数字
+     * 支持: 一~九, 十, 十一~九十九, 一百~九百九十九等
+     */
+    private static int chineseToNumber(String chinese) {
+        // 如果是阿拉伯数字,直接返回
+        try {
+            return Integer.parseInt(chinese);
+        } catch (NumberFormatException e) {
+            // 不是阿拉伯数字,继续处理中文数字
+        }
+
+        // 简单映射(个位数)
+        Map<String, Integer> basicMap = new HashMap<>();
+        basicMap.put("一", 1);
+        basicMap.put("二", 2);
+        basicMap.put("三", 3);
+        basicMap.put("四", 4);
+        basicMap.put("五", 5);
+        basicMap.put("六", 6);
+        basicMap.put("七", 7);
+        basicMap.put("八", 8);
+        basicMap.put("九", 9);
+        basicMap.put("十", 10);
+
+        // 如果是个位数或十,直接返回
+        if (basicMap.containsKey(chinese)) {
+            return basicMap.get(chinese);
+        }
+
+        // 处理复合数字: 十一~十九
+        if (chinese.startsWith("十") && chinese.length() == 2) {
+            String secondChar = chinese.substring(1);
+            if (basicMap.containsKey(secondChar)) {
+                return 10 + basicMap.get(secondChar);
+            }
+        }
+
+        // 处理: 二十~九十九
+        if (chinese.length() == 2 && chinese.endsWith("十")) {
+            String firstChar = chinese.substring(0, 1);
+            if (basicMap.containsKey(firstChar)) {
+                return basicMap.get(firstChar) * 10;
+            }
+        }
+
+        // 处理: 二十一~九十九
+        if (chinese.length() == 3 && chinese.charAt(1) == '十') {
+            String firstChar = chinese.substring(0, 1);
+            String thirdChar = chinese.substring(2, 3);
+            if (basicMap.containsKey(firstChar) && basicMap.containsKey(thirdChar)) {
+                return basicMap.get(firstChar) * 10 + basicMap.get(thirdChar);
+            }
+        }
+
+        // 如果不支持中文数字格式,返回0
+        System.err.println("不支持的中文数字格式: " + chinese + ", 请使用阿拉伯数字");
+        return 0;
+    }
+}

airport-ledger/src/main/resources/mapper/ledger/LedgerContractExpirationDetailMapper.xml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sundot.airport.ledger.mapper.LedgerContractExpirationDetailMapper">
+
+    <resultMap type="LedgerContractExpirationDetail" id="LedgerContractExpirationDetailResult">
+        <result property="tenantId" column="tenant_id"/>
+        <result property="revision" column="revision"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="id" column="id"/>
+        <result property="sourceId" column="source_id"/>
+        <result property="contractName" column="contract_name"/>
+        <result property="contractStartDate" column="contract_start_date"/>
+        <result property="contractEndDate" column="contract_end_date"/>
+    </resultMap>
+
+    <sql id="selectLedgerContractExpirationDetailVo">
+        select tenant_id,
+               revision,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               id,
+               source_id,
+               contract_name,
+               contract_start_date,
+               contract_end_date
+        from ledger_contract_expiration_detail
+    </sql>
+
+    <select id="selectLedgerContractExpirationDetailList" parameterType="LedgerContractExpirationDetail"
+            resultMap="LedgerContractExpirationDetailResult">
+        <include refid="selectLedgerContractExpirationDetailVo"/>
+        <where>
+            <if test="tenantId != null  and tenantId != ''">and tenant_id = #{tenantId}</if>
+            <if test="revision != null ">and revision = #{revision}</if>
+            <if test="sourceId != null ">and source_id = #{sourceId}</if>
+            <if test="contractName != null  and contractName != ''">and contract_name like concat('%', #{contractName},
+                '%')
+            </if>
+            <if test="contractStartDate != null ">and contract_start_date = #{contractStartDate}</if>
+            <if test="contractEndDate != null ">and contract_end_date = #{contractEndDate}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectLedgerContractExpirationDetailById" parameterType="Long"
+            resultMap="LedgerContractExpirationDetailResult">
+        <include refid="selectLedgerContractExpirationDetailVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLedgerContractExpirationDetail" parameterType="LedgerContractExpirationDetail"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into ledger_contract_expiration_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="sourceId != null">source_id,</if>
+            <if test="contractName != null and contractName != ''">contract_name,</if>
+            <if test="contractStartDate != null">contract_start_date,</if>
+            <if test="contractEndDate != null">contract_end_date,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="sourceId != null">#{sourceId},</if>
+            <if test="contractName != null and contractName != ''">#{contractName},</if>
+            <if test="contractStartDate != null">#{contractStartDate},</if>
+            <if test="contractEndDate != null">#{contractEndDate},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLedgerContractExpirationDetail" parameterType="LedgerContractExpirationDetail">
+        update ledger_contract_expiration_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="sourceId != null">source_id = #{sourceId},</if>
+            <if test="contractName != null and contractName != ''">contract_name = #{contractName},</if>
+            <if test="contractStartDate != null">contract_start_date = #{contractStartDate},</if>
+            <if test="contractEndDate != null">contract_end_date = #{contractEndDate},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLedgerContractExpirationDetailById" parameterType="Long">
+        delete
+        from ledger_contract_expiration_detail
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteLedgerContractExpirationDetailByIds" parameterType="String">
+        delete from ledger_contract_expiration_detail where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerContractExpirationMapper.xml

@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sundot.airport.ledger.mapper.LedgerContractExpirationMapper">
+
+    <resultMap type="LedgerContractExpiration" id="LedgerContractExpirationResult">
+        <result property="tenantId" column="tenant_id"/>
+        <result property="revision" column="revision"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="contractName" column="contract_name"/>
+        <result property="contractStartDate" column="contract_start_date"/>
+        <result property="contractEndDate" column="contract_end_date"/>
+        <result property="brigadeId" column="brigade_id"/>
+        <result property="brigadeName" column="brigade_name"/>
+        <result property="employmentType" column="employment_type"/>
+    </resultMap>
+
+    <sql id="selectLedgerContractExpirationVo">
+        select tenant_id,
+               revision,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               id,
+               user_id,
+               user_name,
+               contract_name,
+               contract_start_date,
+               contract_end_date,
+               brigade_id,
+               brigade_name,
+               employment_type
+        from ledger_contract_expiration
+    </sql>
+
+    <select id="selectLedgerContractExpirationList" parameterType="LedgerContractExpiration"
+            resultMap="LedgerContractExpirationResult">
+        <include refid="selectLedgerContractExpirationVo"/>
+        <where>
+            <if test="tenantId != null  and tenantId != ''">and tenant_id = #{tenantId}</if>
+            <if test="revision != null ">and revision = #{revision}</if>
+            <if test="userId != null ">and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
+            <if test="contractName != null  and contractName != ''">and contract_name like concat('%', #{contractName},
+                '%')
+            </if>
+            <if test="contractStartDate != null ">and contract_start_date = #{contractStartDate}</if>
+            <if test="contractEndDate != null ">and contract_end_date = #{contractEndDate}</if>
+            <if test="brigadeId != null ">and brigade_id = #{brigadeId}</if>
+            <if test="brigadeName != null  and brigadeName != ''">and brigade_name like concat('%', #{brigadeName},
+                '%')
+            </if>
+            <if test="employmentType != null  and employmentType != ''">and employment_type = #{employmentType}</if>
+            <if test="contractStartDateQueryStartDate != null ">
+                and contract_start_date <![CDATA[ >= ]]> #{contractStartDateQueryStartDate}
+            </if>
+            <if test="contractStartDateQueryEndDate != null ">
+                and contract_start_date <![CDATA[ <= ]]> #{contractStartDateQueryEndDate}
+            </if>
+            <if test="contractEndDateQueryStartDate != null ">
+                and contract_end_date <![CDATA[ >= ]]> #{contractEndDateQueryStartDate}
+            </if>
+            <if test="contractEndDateQueryEndDate != null ">
+                and contract_end_date <![CDATA[ <= ]]> #{contractEndDateQueryEndDate}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectLedgerContractExpirationById" parameterType="Long" resultMap="LedgerContractExpirationResult">
+        <include refid="selectLedgerContractExpirationVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertLedgerContractExpiration" parameterType="LedgerContractExpiration" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into ledger_contract_expiration
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="contractName != null and contractName != ''">contract_name,</if>
+            <if test="contractStartDate != null">contract_start_date,</if>
+            <if test="contractEndDate != null">contract_end_date,</if>
+            <if test="brigadeId != null">brigade_id,</if>
+            <if test="brigadeName != null">brigade_name,</if>
+            <if test="employmentType != null">employment_type,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tenantId != null">#{tenantId},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="contractName != null and contractName != ''">#{contractName},</if>
+            <if test="contractStartDate != null">#{contractStartDate},</if>
+            <if test="contractEndDate != null">#{contractEndDate},</if>
+            <if test="brigadeId != null">#{brigadeId},</if>
+            <if test="brigadeName != null">#{brigadeName},</if>
+            <if test="employmentType != null">#{employmentType},</if>
+        </trim>
+    </insert>
+
+    <update id="updateLedgerContractExpiration" parameterType="LedgerContractExpiration">
+        update ledger_contract_expiration
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="contractName != null and contractName != ''">contract_name = #{contractName},</if>
+            <if test="contractStartDate != null">contract_start_date = #{contractStartDate},</if>
+            <if test="contractEndDate != null">contract_end_date = #{contractEndDate},</if>
+            <if test="brigadeId != null">brigade_id = #{brigadeId},</if>
+            <if test="brigadeName != null">brigade_name = #{brigadeName},</if>
+            <if test="employmentType != null">employment_type = #{employmentType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteLedgerContractExpirationById" parameterType="Long">
+        delete
+        from ledger_contract_expiration
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteLedgerContractExpirationByIds" parameterType="String">
+        delete from ledger_contract_expiration where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>