diff --git a/src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java b/src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java index 9aa66db..c4c4d08 100644 --- a/src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java +++ b/src/com/engine/attendance/workflow/service/impl/AttendanceSummaryServiceImpl.java @@ -43,6 +43,7 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS @Override public Map addAttendanceSummary(Map params) { + bs.writeLog("params : " + params); ExecutorService taskExecutor = Executors.newCachedThreadPool(); taskExecutor.execute(() -> { String mainIds = Util.null2String(params.get("mainIds")); @@ -218,13 +219,13 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS bs.writeLog("currentDate : " + targetDate); if (typeSelect.equals("9")) { String targetYear = String.valueOf(targetDate.getYear()); - String targetMonth = targetDate.getMonth().toString(); + String targetMonth = String.valueOf(targetDate.getMonthValue()); bs.writeLog("targetYear : " + targetYear + ", targetMonth : " + targetMonth); dtDates = getDtDates(targetYear, targetMonth, subCompanyId, departmentId, resourceId, status); } else if (typeSelect.equals("10")) { targetDate = targetDate.minusMonths(1); String targetYear = String.valueOf(targetDate.getYear()); - String targetMonth = targetDate.getMonth().toString(); + String targetMonth = String.valueOf(targetDate.getMonthValue()); bs.writeLog("targetYear : " + targetYear + ", targetMonth : " + targetMonth); dtDates = getDtDates(targetYear, targetMonth, subCompanyId, departmentId, resourceId, status); } else { @@ -281,7 +282,10 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS //分页处理 int start = pageIndex * pageSize; int end = Math.min((pageIndex + 1) * pageSize, dataList.size()); - List> resultList = dataList.subList(start, end); + List> resultList = new ArrayList<>(); + if (start <= dataList.size()) { + resultList = dataList.subList(start, end); + } count = dataList.size(); if (count <= 0) { pageCount = 0; @@ -354,7 +358,7 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS bs.writeLog("dtDates_size : " + dtDates.size() + ", dtListSql : " + dtListSql); return dtDates; } else { - return null; + return new ArrayList<>(); } }