liuliang

src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java

@@ -44,10 +44,15 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ
         List<Map<String,Object>> offsetAskForLeaveAnomaly = (List<Map<String,Object>>)params.get("offsetAskForLeaveAnomaly");
         //出差外出后消除的异常
         List<Map<String,Object>> offsetEvectionAnomaly = (List<Map<String,Object>>)params.get("offsetEvectionAnomaly");
-
         //经过请假外出处理过的异常项目
         List<Map<String,Object>> abnormalClockInList = (List<Map<String,Object>>)params.get("abnormalClockInList");
 
+        //总抵消异常
+        List<Map<String,Object>> anomalyList = Lists.newArrayList();
+        anomalyList.addAll(offsetEvectionAnomaly);
+        anomalyList.addAll(abnormalClockInList);
+
+
         Map<String,Map<String,Object>> clcokInTimeMap = Maps.newHashMap();
 
         List<Map<String, Object>> workOverTimeResults = null;
@@ -231,9 +236,16 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ
             }else {
                 if (DateUtil.getTime(realityStartTime).compareTo(DateUtil.getTime(kssj)) >0){
                     beLateTime = DateUtil.getBetWeenMinutes(kssj,realityStartTime);
+                    List<Map<String,Object>> collect1 = anomalyList.stream().filter(e->e.get("pointTime").toString().split(" ")[1].equals(dtkssj)).collect(Collectors.toList());
+
                     if (!"".equals(jbwdhlfzs) && beLateTime < Integer.valueOf(jbwdhlfzs)){
                         beLateTime=0;
                     }
+                    //当存在迟到异常被抵消的情况
+                    if (collect1.size() > 0){
+                        beLateTime=0;
+                    }
+
                 }
             }
             /**
@@ -263,9 +275,14 @@ public class WorkOverTimeServiceImpl extends Service implements WorkOverTimeServ
             }else {
                 if (DateUtil.getTime(realityEndime).compareTo(DateUtil.getTime(jssj)) <0){
                     leaveElaryTime = DateUtil.getBetWeenMinutes(realityEndime,jssj);
+                    List<Map<String,Object>> collect2 = anomalyList.stream().filter(e->e.get("pointTime").toString().split(" ")[1].equals(dtjssj)).collect(Collectors.toList());
                     if (!"".equals(jbzzhlfzs) && leaveElaryTime < Integer.valueOf(jbzzhlfzs)){
                         leaveElaryTime=0;
                     }
+                    //当存在早退异常被抵消的情况
+                    if (collect2.size()>0){
+                        leaveElaryTime=0;
+                    }
                 }
 
             }

src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java

@@ -204,9 +204,9 @@ public class AttendanceAnalysisWrapper extends Service {
                 put("dxhs",askForLeaveItem.get("thfghlfzs"));
             }};
 
-            scheduleResult.add(askForLeaveMap);
             if (!"".equals(Util.null2String(askForLeaveData.get("kssj"))) && !"".equals(Util.null2String(askForLeaveData.get("jssj"))) &&(CheckBoxEnum.CHECKED.getKey().equals(askForLeaveItem.get("lgsbxydk")) || CheckBoxEnum.CHECKED.getKey().equals(askForLeaveItem.get("fgsbxydk")))){
                 needClockInSchedule.add(askForLeaveMap);
+                scheduleResult.add(askForLeaveMap);
             }
         }
         for (Map<String,Object> evectionData :evectionList){
@@ -239,9 +239,9 @@ public class AttendanceAnalysisWrapper extends Service {
                 put("zddxfz",evectionItem.get("tqlghlfzs"));
                 put("dxhs",evectionItem.get("thfghlfzs"));
             }};
-            scheduleResult.add(evectionMap);
             if (!"".equals(Util.null2String(evectionData.get("kssj"))) && !"".equals(Util.null2String(evectionData.get("jssj"))) && (CheckBoxEnum.CHECKED.getKey().equals(evectionItem.get("lgsbxydk")) || CheckBoxEnum.CHECKED.getKey().equals(evectionItem.get("fgsbxydk")))){
                 needClockInSchedule.add(evectionMap);
+                scheduleResult.add(evectionMap);
             }
         }