出勤结果逻辑修复

src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java

@@ -115,7 +115,7 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
                 adjustWorkOverTimeClass(data, attendanceItems,commandContext);
             }
             resultMap.put(shiftResult.get("bcrq").toString(),bcData);
-            clockInTimeDataMap.put(shiftResult.get("bcrq").toString(),shiftResult.get("clockInTimeData"));
+            clockInTimeDataMap.put(shiftResult.get("bcrq").toString(),shiftResult.get("oldclockInTimeData"));
         }
 
         /** 加班计划*/

src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.java

@@ -283,6 +283,7 @@ public class ShiftServiceImpl extends Service implements ShiftService {
         clockInTimeDataParam.put("askForLeaveAndEvctionSchedule",askForLeaveAndEvctionSchedule);
         List<ClockPointDTO> clockInTimeData = utilService.getClockInPointCmd(clockInTimeDataParam);
 
+        clockInDataMatchInfo.put("oldclockInTimeData",clockInTimeData);
         if(clockInTimeData != null && clockInTimeData.size() > 0) {
             clockInTimeData = clockInTimeData.stream().filter(ClockPointDTO::isRecord).collect(Collectors.toList());
         }

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<Map<String,Object>>)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<Map<String,Object>>)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()));