diff --git a/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java b/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java index 9e994f1..f403ca3 100644 --- a/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java +++ b/src/main/java/com/bonus/boot/manager/manager/utils/ImportNoPhotoExcelHelper.java @@ -193,7 +193,7 @@ public class ImportNoPhotoExcelHelper { if (row.getRowNum() < 2) continue; break; case "WagesDetailsBean": - if (row.getRowNum() < 6) continue; + if (row.getRowNum() < 5) continue; break; case "CCBWagesDetailsBean": if (row.getRowNum() < 1) continue; diff --git a/src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java b/src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java index cb457b1..77f999b 100644 --- a/src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/wages/service/impl/WagesServiceImpl.java @@ -381,7 +381,7 @@ public class WagesServiceImpl implements WagesService { } // 导出标题 ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter(true); - writer.merge(24, fileName,false); + writer.merge(25, fileName,false); // 合并二级表头 writer.writeCellValue(0,1,"序号");