考勤,出勤汇总报表查询接口逻辑优化

zm_dev
sy 1 year ago
parent b851062c1c
commit 0183afe5d4

@ -221,13 +221,13 @@ public class AttendanceSummaryServiceImpl extends Service implements AttendanceS
String targetYear = String.valueOf(targetDate.getYear()); String targetYear = String.valueOf(targetDate.getYear());
String targetMonth = String.valueOf(targetDate.getMonthValue()); 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, status, subCompanyId, departmentId, resourceId);
} 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 = String.valueOf(targetDate.getMonthValue()); 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, status, subCompanyId, departmentId, resourceId);
} else { } else {
//调用临时汇总数据方法,生成数据 //调用临时汇总数据方法,生成数据
dtDates = getTemAttendanceSummary(jsonObj); dtDates = getTemAttendanceSummary(jsonObj);

Loading…
Cancel
Save