diff --git a/src/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.java b/src/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.java index 3a145d9..6e56baf 100644 --- a/src/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.java +++ b/src/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.java @@ -51,7 +51,7 @@ public class ExcelExportImportServiceImpl extends Service implements ExcelExport paramMap.put("pageSize", total); } paramMap.put("pageindex", "1"); - + log.info("查询条件:{}",paramMap); Map scheduleResult = getWorkRulesService(user).getDepartSchedule(paramMap); List columns = buildScheduleColumns((List>) scheduleResult.get("columns")); List> records = buildScheduleRecords((List>) scheduleResult.get("datas")); @@ -173,7 +173,7 @@ public class ExcelExportImportServiceImpl extends Service implements ExcelExport } singleCheck.put(key, Optional.ofNullable(map.get(key)).orElse("").toString()); } - log.info(i + 3 + "-singleCheck:[{}]", singleCheck); + log.info(i + 3 + "-singleCheck:{}", singleCheck); isError = singleScheduleLineCheck(singleCheck, title, monthDays, toImportScheduleInfos, employeeInfoList, shiftMapWithMc, excelComments, i + 3, formModeId, empIds); if (isError) { errorCount += 1; diff --git a/src/com/engine/attendance/component/ImportAndExport/web/ExcelController.java b/src/com/engine/attendance/component/ImportAndExport/web/ExcelController.java index b54c08b..afabe72 100644 --- a/src/com/engine/attendance/component/ImportAndExport/web/ExcelController.java +++ b/src/com/engine/attendance/component/ImportAndExport/web/ExcelController.java @@ -42,7 +42,7 @@ public class ExcelController { Map paramMap = ParamUtil.request2Map(request); XSSFWorkbook workbook = getExcelService(user).exportSchedule(paramMap); String time = LocalDate.now().toString(); - String fileName = "日批排班列表" + time; + String fileName = "日历排班列表" + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { diff --git a/src/com/engine/common/util/excel/ExcelUtil.java b/src/com/engine/common/util/excel/ExcelUtil.java index 7641d90..48082f9 100644 --- a/src/com/engine/common/util/excel/ExcelUtil.java +++ b/src/com/engine/common/util/excel/ExcelUtil.java @@ -144,7 +144,6 @@ public class ExcelUtil { } for (int rowIndex = 0; rowIndex <= rowList.size(); rowIndex++) { - List infoList = rowList.get(rowIndex); XSSFRow row = sheet.createRow(rowIndex); float height = 18; float finalHeight = 18; @@ -155,6 +154,7 @@ public class ExcelUtil { cell.setCellType(CellType.STRING); cell.setCellValue(title); } else { + List infoList = rowList.get(rowIndex - 1); for (int cellIndex = 0; cellIndex < infoList.size(); cellIndex++) { XSSFCell cell = row.createCell(cellIndex); if (rowIndex == 1) {