资质等级信息动态导出

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

@@ -19,6 +19,7 @@ import com.sundot.airport.common.enums.BusinessType;
 import com.sundot.airport.ledger.domain.LedgerCertificateInfo;
 import com.sundot.airport.ledger.dto.LedgerCertificateImportTemplate;
 import com.sundot.airport.ledger.service.ILedgerCertificateInfoService;
+import com.sundot.airport.ledger.utils.CertificateExcelExportUtil;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.common.core.page.TableDataInfo;
 import com.sundot.airport.ledger.utils.CertificateExcelImportUtil;
@@ -50,15 +51,14 @@ public class LedgerCertificateInfoController extends BaseController {
     }
 
     /**
-     * 导出证书信息列表
+     * 导出证书信息列表（含复审时间列）
      */
     @PreAuthorize("@ss.hasPermi('ledger:certificate:export')")
     @Log(title = "证书信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, LedgerCertificateInfo ledgerCertificateInfo) {
-        List<LedgerCertificateInfo> list = certificateInfoService.selectCertificateInfoList(ledgerCertificateInfo);
-        ExcelUtil<LedgerCertificateInfo> util = new ExcelUtil<LedgerCertificateInfo>(LedgerCertificateInfo.class);
-        util.exportExcel(response, list, "证书信息数据");
+        List<LedgerCertificateInfo> list = certificateInfoService.selectCertificateInfoListWithReviews(ledgerCertificateInfo);
+        CertificateExcelExportUtil.exportCertificateExcel(response, list, "证书信息数据");
     }
 
     /**

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

@@ -33,7 +33,6 @@ public class LedgerCertificateInfo extends BaseEntity {
     /**
      * 租户号
      */
-    @Excel(name = "租户号")
     private String tenantId;
 
     /**

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

@@ -90,4 +90,12 @@ public interface LedgerCertificateReviewRecordMapper {
      * @return 结果
      */
     public int batchInsertReviewRecords(@Param("list") List<LedgerCertificateReviewRecord> list);
+
+    /**
+     * 根据多个证书ID批量查询复审记录
+     * 
+     * @param certIds 证书ID列表
+     * @return 复审记录列表
+     */
+    public List<LedgerCertificateReviewRecord> selectReviewRecordsByCertIds(@Param("certIds") List<Long> certIds);
 }

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

@@ -27,6 +27,15 @@ public interface ILedgerCertificateInfoService {
     public List<LedgerCertificateInfo> selectCertificateInfoList(LedgerCertificateInfo ledgerCertificateInfo);
 
     /**
+     * 查询证书信息列表（包含复审记录）
+     * 用于导出场景
+     * 
+     * @param ledgerCertificateInfo 证书信息查询条件
+     * @return 证书信息集合（包含复审记录）
+     */
+    public List<LedgerCertificateInfo> selectCertificateInfoListWithReviews(LedgerCertificateInfo ledgerCertificateInfo);
+
+    /**
      * 新增证书信息
      * 
      * @param ledgerCertificateInfo 证书信息

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

@@ -71,6 +71,39 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
     }
 
     /**
+     * 查询证书信息列表（包含复审记录）
+     * 用于导出场景，批量加载复审记录避免N+1查询
+     */
+    @Override
+    public List<LedgerCertificateInfo> selectCertificateInfoListWithReviews(LedgerCertificateInfo ledgerCertificateInfo) {
+        List<LedgerCertificateInfo> certList = ledgerCertificateInfoMapper.selectCertificateInfoList(ledgerCertificateInfo);
+        if (certList == null || certList.isEmpty()) {
+            return certList;
+        }
+        // 收集所有证书ID
+        List<Long> certIds = certList.stream()
+                .map(LedgerCertificateInfo::getId)
+                .filter(id -> id != null)
+                .collect(Collectors.toList());
+        if (certIds.isEmpty()) {
+            return certList;
+        }
+        // 批量查询所有复审记录
+        List<LedgerCertificateReviewRecord> allRecords = ledgerCertificateReviewRecordMapper.selectReviewRecordsByCertIds(certIds);
+        // 按证书ID分组
+        Map<Long, List<LedgerCertificateReviewRecord>> recordsByCertId = new HashMap<>();
+        for (LedgerCertificateReviewRecord record : allRecords) {
+            recordsByCertId.computeIfAbsent(record.getCertId(), k -> new ArrayList<>()).add(record);
+        }
+        // 设置到每个证书对象
+        for (LedgerCertificateInfo cert : certList) {
+            List<LedgerCertificateReviewRecord> records = recordsByCertId.get(cert.getId());
+            cert.setReviewRecords(records != null ? records : new ArrayList<>());
+        }
+        return certList;
+    }
+
+    /**
      * 新增证书信息
      * 
      * @param ledgerCertificateInfo 证书信息

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

@@ -0,0 +1,234 @@
+package com.sundot.airport.ledger.utils;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.TreeMap;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.sundot.airport.ledger.domain.LedgerCertificateInfo;
+import com.sundot.airport.ledger.domain.LedgerCertificateReviewRecord;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.util.IOUtils;
+
+/**
+ * 证书Excel导出工具类
+ * 支持动态复审时间列导出，与导入模板格式一致
+ *
+ * @author ruoyi
+ * @date 2026-07-02
+ */
+public class CertificateExcelExportUtil {
+
+    /** 标准列头定义（与@Excel注解顺序一致） */
+    private static final String[] STANDARD_HEADERS = {
+            "单位", "姓名", "性别", "出生日期", "身份证号",
+            "证书等级", "发证日期", "证书编号", "理论考核成绩", "实操考核成绩",
+            "评定成绩", "用工形式", "服务期（月）", "备注"
+    };
+
+    /** 标准列宽度 */
+    private static final int[] STANDARD_WIDTHS = {
+            16, 16, 16, 30, 16,
+            16, 30, 16, 16, 16,
+            16, 16, 16, 16
+    };
+
+    /**
+     * 导出证书信息到Excel（含动态复审时间列）
+     *
+     * @param response  HTTP响应
+     * @param list      证书信息列表
+     * @param sheetName 工作表名称
+     */
+    public static void exportCertificateExcel(HttpServletResponse response, List<LedgerCertificateInfo> list, String sheetName) {
+        Workbook wb = null;
+        try {
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setCharacterEncoding("utf-8");
+
+            wb = new SXSSFWorkbook();
+            Sheet sheet = wb.createSheet(sheetName);
+
+            // 创建样式
+            CellStyle headerStyle = createHeaderStyle(wb);
+            CellStyle dataStyle = createDataStyle(wb);
+            CellStyle dateStyle = createDateStyle(wb);
+
+            // 计算最大复审次数
+            int maxReviewSeq = getMaxReviewSeq(list);
+
+            // 构建完整列头
+            int totalCols = STANDARD_HEADERS.length + maxReviewSeq;
+            String[] headers = new String[totalCols];
+            System.arraycopy(STANDARD_HEADERS, 0, headers, 0, STANDARD_HEADERS.length);
+            for (int i = 0; i < maxReviewSeq; i++) {
+                headers[STANDARD_HEADERS.length + i] = "第" + (i + 1) + "次复审时间";
+            }
+
+            // 写入表头
+            Row headerRow = sheet.createRow(0);
+            headerRow.setHeightInPoints(30);
+            for (int i = 0; i < totalCols; i++) {
+                Cell cell = headerRow.createCell(i);
+                cell.setCellValue(headers[i]);
+                cell.setCellStyle(headerStyle);
+                // 设置列宽
+                if (i < STANDARD_WIDTHS.length) {
+                    sheet.setColumnWidth(i, (int) ((STANDARD_WIDTHS[i] + 0.72) * 256));
+                } else {
+                    sheet.setColumnWidth(i, (int) ((30 + 0.72) * 256)); // 复审时间列宽度30
+                }
+            }
+
+            // 写入数据行
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            for (int i = 0; i < list.size(); i++) {
+                LedgerCertificateInfo cert = list.get(i);
+                Row dataRow = sheet.createRow(i + 1);
+                int col = 0;
+
+                // 标准字段
+                setCellValue(dataRow, col++, cert.getUnitName(), dataStyle);
+                setCellValue(dataRow, col++, cert.getPersonName(), dataStyle);
+                setCellValue(dataRow, col++, cert.getGender(), dataStyle);
+                setDateCellValue(dataRow, col++, cert.getBirthDate(), sdf, dateStyle);
+                setCellValue(dataRow, col++, cert.getIdCard(), dataStyle);
+                setCellValue(dataRow, col++, cert.getCertLevel(), dataStyle);
+                setDateCellValue(dataRow, col++, cert.getIssueDate(), sdf, dateStyle);
+                setCellValue(dataRow, col++, cert.getCertNo(), dataStyle);
+                setBigDecimalCellValue(dataRow, col++, cert.getTheoryScore(), dataStyle);
+                setBigDecimalCellValue(dataRow, col++, cert.getPracticeScore(), dataStyle);
+                setCellValue(dataRow, col++, cert.getEvalScore(), dataStyle);
+                setCellValue(dataRow, col++, cert.getEmploymentType(), dataStyle);
+                setCellValue(dataRow, col++, cert.getServiceMonths() != null ? String.valueOf(cert.getServiceMonths()) : null, dataStyle);
+                setCellValue(dataRow, col++, cert.getRemark(), dataStyle);
+
+                // 复审时间字段（按次序填充）
+                TreeMap<Integer, Date> reviewTimeMap = getReviewTimeMap(cert);
+                for (int seq = 1; seq <= maxReviewSeq; seq++) {
+                    Date reviewTime = reviewTimeMap.get(seq);
+                    setDateCellValue(dataRow, col++, reviewTime, sdf, dateStyle);
+                }
+            }
+
+            wb.write(response.getOutputStream());
+        } catch (Exception e) {
+            throw new RuntimeException("导出证书信息失败", e);
+        } finally {
+            IOUtils.closeQuietly(wb);
+        }
+    }
+
+    /**
+     * 获取列表中最大的复审次序
+     */
+    private static int getMaxReviewSeq(List<LedgerCertificateInfo> list) {
+        int maxSeq = 0;
+        if (list == null) {
+            return 0;
+        }
+        for (LedgerCertificateInfo cert : list) {
+            List<LedgerCertificateReviewRecord> records = cert.getReviewRecords();
+            if (records != null) {
+                for (LedgerCertificateReviewRecord record : records) {
+                    if (record.getReviewSeq() != null && record.getReviewSeq() > maxSeq) {
+                        maxSeq = record.getReviewSeq();
+                    }
+                }
+            }
+        }
+        return maxSeq;
+    }
+
+    /**
+     * 将复审记录转为 seq -> reviewTime 的有序Map
+     */
+    private static TreeMap<Integer, Date> getReviewTimeMap(LedgerCertificateInfo cert) {
+        TreeMap<Integer, Date> map = new TreeMap<>();
+        List<LedgerCertificateReviewRecord> records = cert.getReviewRecords();
+        if (records != null) {
+            for (LedgerCertificateReviewRecord record : records) {
+                if (record.getReviewSeq() != null) {
+                    map.put(record.getReviewSeq(), record.getReviewTime());
+                }
+            }
+        }
+        return map;
+    }
+
+    /** 创建表头样式 */
+    private static CellStyle createHeaderStyle(Workbook wb) {
+        CellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderTop(BorderStyle.THIN);
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        Font font = wb.createFont();
+        font.setFontName("Arial");
+        font.setFontHeightInPoints((short) 10);
+        font.setBold(true);
+        font.setColor(IndexedColors.WHITE.getIndex());
+        style.setFont(font);
+        return style;
+    }
+
+    /** 创建数据样式 */
+    private static CellStyle createDataStyle(Workbook wb) {
+        CellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setBorderTop(BorderStyle.THIN);
+        style.setBorderBottom(BorderStyle.THIN);
+        Font font = wb.createFont();
+        font.setFontName("Arial");
+        font.setFontHeightInPoints((short) 10);
+        style.setFont(font);
+        return style;
+    }
+
+    /** 创建日期样式 */
+    private static CellStyle createDateStyle(Workbook wb) {
+        CellStyle style = createDataStyle(wb);
+        DataFormat dataFormat = wb.createDataFormat();
+        style.setDataFormat(dataFormat.getFormat("yyyy-MM-dd"));
+        return style;
+    }
+
+    /** 设置字符串单元格值 */
+    private static void setCellValue(Row row, int col, String value, CellStyle style) {
+        Cell cell = row.createCell(col);
+        cell.setCellStyle(style);
+        cell.setCellValue(value != null ? value : "");
+    }
+
+    /** 设置日期单元格值 */
+    private static void setDateCellValue(Row row, int col, Date value, SimpleDateFormat sdf, CellStyle dateStyle) {
+        Cell cell = row.createCell(col);
+        if (value != null) {
+            cell.setCellStyle(dateStyle);
+            cell.setCellValue(value);
+        } else {
+            cell.setCellStyle(dateStyle);
+            cell.setCellValue("");
+        }
+    }
+
+    /** 设置BigDecimal单元格值 */
+    private static void setBigDecimalCellValue(Row row, int col, BigDecimal value, CellStyle style) {
+        Cell cell = row.createCell(col);
+        cell.setCellStyle(style);
+        if (value != null) {
+            cell.setCellValue(value.doubleValue());
+        }
+    }
+}

airport-ledger/src/main/resources/mapper/personnel/LedgerCertificateReviewRecordMapper.xml

@@ -107,6 +107,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <select id="selectReviewRecordsByCertIds" resultMap="CertificateReviewRecordResult">
+        <include refid="selectCertificateReviewRecordVo"/>
+        where del_flag = '0' and cert_id in
+        <foreach collection="certIds" item="certId" open="(" separator="," close=")">
+            #{certId}
+        </foreach>
+        order by cert_id asc, review_seq asc
+    </select>
+
     <insert id="batchInsertReviewRecords">
         insert into ledger_certificate_review_record
         (cert_id, review_seq, review_time, remark, create_by, create_time, del_flag)