diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java index 2770722..5bf10b8 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java +++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java @@ -115,7 +115,7 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand clockInTimeData = utilService.getClockInPointCmd(clockInTimeDataParam); + clockInDataMatchInfo.put("oldclockInTimeData",clockInTimeData); if(clockInTimeData != null && clockInTimeData.size() > 0) { clockInTimeData = clockInTimeData.stream().filter(ClockPointDTO::isRecord).collect(Collectors.toList()); } diff --git a/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java b/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java index 1731a32..43c2381 100644 --- a/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java +++ b/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java @@ -267,6 +267,9 @@ public class UpdateAttendanceResultWrapper extends Service { resultMap.put("itemduration",itemduration); askForLeaveToOffsetAbnomaly.put(askForLeaveList.get(i),(List>)handleMap.get("offsetAskForLeaveAnomaly")); resultMap.put("item",askForLeaveList.get(i).get("jqlx")); + if (sffzcx.equals(CheckBoxEnum.CHECKED.getKey())){ + resultList.add(resultMap); + } }else if (!"".equals(qjsc) || (CheckBoxEnum.CHECKED.getKey().equals(btj) && (btgz.equals(HalfDayRuleREnum.HALF_TOTAL_DURATION.getKey()) || btgz.equals(HalfDayRuleREnum.HALF_RATED_DURATION.getKey())))){ if (CheckBoxEnum.CHECKED.getKey().equals(btj)){ if (btgz.equals(HalfDayRuleREnum.HALF_TOTAL_DURATION.getKey())){ @@ -450,6 +453,9 @@ public class UpdateAttendanceResultWrapper extends Service { resultMap.put("itemduration",itemduration); evectionToOffsetAbnomaly.put(evectionList.get(i),(List>)handleMap.get("offsetEvectionAnomaly")); resultMap.put("item",evectionList.get(i).get("cclx")); + if (sffzcx.equals(CheckBoxEnum.CHECKED.getKey())){ + resultList.add(resultMap); + } }else if (!"".equals(ccsc) || (CheckBoxEnum.CHECKED.getKey().equals(btj) && (btgz.equals(HalfDayRuleREnum.HALF_TOTAL_DURATION.getKey()) || btgz.equals(HalfDayRuleREnum.HALF_RATED_DURATION.getKey())))){ //时长出差 itemduration = Utils.getItemduration(hsl,hsdw,ccscMinute,AccountingUnitEnum.MINUTES,Double.valueOf(scheduleResult.get(0).get("edsc").toString()));