|
|
|
@ -51,7 +51,7 @@ public class ExcelExportImportServiceImpl extends Service implements ExcelExport
|
|
|
|
|
paramMap.put("pageSize", total);
|
|
|
|
|
}
|
|
|
|
|
paramMap.put("pageindex", "1");
|
|
|
|
|
|
|
|
|
|
log.info("查询条件:{}",paramMap);
|
|
|
|
|
Map<String, Object> scheduleResult = getWorkRulesService(user).getDepartSchedule(paramMap);
|
|
|
|
|
List<WeaTableColumn> columns = buildScheduleColumns((List<Map<String, Object>>) scheduleResult.get("columns"));
|
|
|
|
|
List<Map<String, Object>> records = buildScheduleRecords((List<Map<String, Object>>) 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;
|
|
|
|
|