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