From 860a8254419fb787f8cadaaf2992c23f572e1616 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Fri, 10 Nov 2023 00:16:44 +0800
Subject: [PATCH] liuliang

---
 .../attendanceanalysis/cmd/BeLateCmd.java     |  37 +++
 .../cmd/GetClockInTimeCmd.java                |  42 ++--
 .../attendanceanalysis/cmd/LeaveEarlyCmd.java |  23 ++
 .../service/BeLateService.java                |  16 +-
 .../service/ForgetClockInService.java         |   6 +
 .../service/UtilService.java                  |   2 +-
 .../service/impl/BeLateServiceImpl.java       |  12 +
 .../impl/ForgetClockInServiceImpl.java        |   5 +
 .../service/impl/UtilServiceImpl.java         | 100 +++++++-
 .../wrapper/AttendanceAnalysisWrapper.java    | 234 +++++++++++++++++-
 .../UpdateAttendanceResultWrapper.java        |  28 +++
 .../GetAttendanceItemsByPersonDataCmd.java    |   2 +-
 .../engine/attendance/enums/CheckBoxEnum.java |  27 ++
 .../enums/ClassSegmentTypeEnum.java           |   5 +-
 .../engine/attendance/enums/PeriodOfTime.java |  32 +++
 .../workflow/web/ProcessSubmitCheckApi.java   |   4 +-
 src/com/engine/common/cmd/GetDateCmd.java     |  33 +++
 src/com/engine/common/util/DateUtil.java      |  16 +-
 src/com/engine/common/util/Utils.java         |  30 +++
 .../GetAttendanceItemsByPersonDataCmd.class   | Bin 8377 -> 8378 bytes
 .../attendanceanalysis/cmd/BeLateCmd.class    | Bin 0 -> 1888 bytes
 .../cmd/GetClockInTimeCmd.class               | Bin 14542 -> 14342 bytes
 .../cmd/LeaveEarlyCmd.class                   | Bin 0 -> 1325 bytes
 .../service/BeLateService.class               | Bin 351 -> 485 bytes
 .../service/impl/BeLateServiceImpl.class      | Bin 847 -> 1137 bytes
 .../service/impl/UtilServiceImpl.class        | Bin 6324 -> 11594 bytes
 .../wrapper/AttendanceAnalysisWrapper$1.class | Bin 0 -> 1971 bytes
 .../wrapper/AttendanceAnalysisWrapper$2.class | Bin 0 -> 1965 bytes
 .../wrapper/AttendanceAnalysisWrapper.class   | Bin 5557 -> 14122 bytes
 .../attendance/enums/CheckBoxEnum.class       | Bin 0 -> 1547 bytes
 .../enums/ClassSegmentTypeEnum.class          | Bin 1978 -> 2246 bytes
 .../attendance/enums/PeriodOfTime.class       | Bin 0 -> 1615 bytes
 .../com/engine/common/cmd/GetDateCmd.class    | Bin 0 -> 2096 bytes
 .../com/engine/common/util/DateUtil.class     | Bin 4865 -> 4997 bytes
 .../com/engine/common/util/Utils$1.class      | Bin 535 -> 535 bytes
 .../com/engine/common/util/Utils$2.class      | Bin 517 -> 517 bytes
 .../com/engine/common/util/Utils$3.class      | Bin 908 -> 908 bytes
 .../com/engine/common/util/Utils.class        | Bin 7270 -> 9002 bytes
 target/test-classes/Test.class                | Bin 1478 -> 1343 bytes
 test/Test.java                                |  59 ++++-
 40 files changed, 667 insertions(+), 46 deletions(-)
 create mode 100644 src/com/engine/attendance/attendanceanalysis/cmd/BeLateCmd.java
 create mode 100644 src/com/engine/attendance/attendanceanalysis/cmd/LeaveEarlyCmd.java
 create mode 100644 src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
 create mode 100644 src/com/engine/attendance/enums/CheckBoxEnum.java
 create mode 100644 src/com/engine/attendance/enums/PeriodOfTime.java
 create mode 100644 src/com/engine/common/cmd/GetDateCmd.java
 create mode 100644 target/classes/com/engine/attendance/attendanceanalysis/cmd/BeLateCmd.class
 create mode 100644 target/classes/com/engine/attendance/attendanceanalysis/cmd/LeaveEarlyCmd.class
 create mode 100644 target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$1.class
 create mode 100644 target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$2.class
 create mode 100644 target/classes/com/engine/attendance/enums/CheckBoxEnum.class
 create mode 100644 target/classes/com/engine/attendance/enums/PeriodOfTime.class
 create mode 100644 target/classes/com/engine/common/cmd/GetDateCmd.class

diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/BeLateCmd.java b/src/com/engine/attendance/attendanceanalysis/cmd/BeLateCmd.java
new file mode 100644
index 0000000..254a774
--- /dev/null
+++ b/src/com/engine/attendance/attendanceanalysis/cmd/BeLateCmd.java
@@ -0,0 +1,37 @@
+package com.engine.attendance.attendanceanalysis.cmd;
+
+import com.engine.common.biz.AbstractCommonCommand;
+import com.engine.common.entity.BizLogContext;
+import com.engine.core.interceptor.CommandContext;
+import weaver.general.Util;
+
+import java.util.List;
+import java.util.Map;
+
+public class BeLateCmd extends AbstractCommonCommand<Map<String,Object>> {
+    @Override
+    public BizLogContext getLogContext() {
+        return null;
+    }
+    public BeLateCmd(Map<String,Object> params){
+        this.params=params;
+    }
+
+    @Override
+    public Map<String, Object> execute(CommandContext commandContext) {
+        //分析人员
+        String userId = Util.null2String(params.get("userId"));
+        //分析日期
+        String analysisDate = Util.null2String(params.get("analysisDate"));
+        //打卡数据
+        List<Map<String, Object>> clockInTimeList = (List<Map<String, Object>>)params.get("analysisDate");
+        //班次
+        List<Map<String, Object>> scheduleResult = (List<Map<String, Object>>)params.get("scheduleResult");
+        //考勤项目
+        List<Map<String, Object>> attendanceItems = (List<Map<String, Object>>)params.get("attendanceItems");
+
+
+
+        return null;
+    }
+}
diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeCmd.java b/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeCmd.java
index 5180b9f..5254111 100644
--- a/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeCmd.java
+++ b/src/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeCmd.java
@@ -54,42 +54,36 @@ public class GetClockInTimeCmd extends AbstractCommonCommand<Map<String,Object>>
 
         if (needGetDateList == null || needGetDateScheduling== null){
             return resultMap;
-        }else if (beforeNeedGetDateList == null && afterNeedGetDateList == null){
+        }else if (beforeNeedGetDateList == null && afterNeedGetDateList == null ){
             resultList = needGetDateList;
         }else if (beforeNeedGetDateList != null && afterNeedGetDateList == null){//前一天有打卡数据，后一天没有打卡数据
             if (beforeNeedGetDateScheduling == null){
                 resultMap.put("resultList",needGetDateList);
                 return resultMap;
             }
-            //前一天是否跨天 1:跨天
-            String beforesfkt = Util.null2String(beforeNeedGetDateScheduling.get(0).get("sfkt"));
-            //当天是否跨天 1：跨天
-            String nowsfkt = Util.null2String(beforeNeedGetDateScheduling.get(0).get("sfkt"));
-            if (!"1".equals(beforesfkt) && !"1".equals(nowsfkt)){
-                resultList = needGetDateList;
-            }else if ("1".equals(beforesfkt) && !"1".equals(nowsfkt)){
-                //前一天跨天，当天没有跨天
-
-            }else if (!"1".equals(beforesfkt) && "1".equals(nowsfkt)){
-                //前一天没有跨天，当天跨天
-
-            }else if ("1".equals(beforesfkt) && "1".equals(nowsfkt)){
-                //前一天跨天，当天也跨天
-
-            }
-
+            resultList=computeStartTime(beforeNeedGetDateScheduling,beforeNeedGetDateList,needGetDateScheduling,needGetDateList,needGetDate);
         }else if (beforeNeedGetDateList == null && afterNeedGetDateList != null){  //前一天没有打卡数据，后一天有打卡数据
-            if (afterNeedGetDateList == null){
+            if (afterNeedGetDateScheduling == null){
                 resultMap.put("resultList",needGetDateList);
                 return resultMap;
             }
-
-
-
+            resultList=computeEndTime(afterNeedGetDateScheduling,afterNeedGetDateList,needGetDateScheduling,needGetDateList,needGetDate);
         }else if (beforeNeedGetDateList !=null && afterNeedGetDateList != null){
             //前后一天都有打卡数据
+            if (beforeNeedGetDateScheduling == null && afterNeedGetDateScheduling ==null){
+                resultList = needGetDateList;
+            }else if (beforeNeedGetDateScheduling != null && afterNeedGetDateScheduling ==null){
+                resultList=computeStartTime(beforeNeedGetDateScheduling,beforeNeedGetDateList,needGetDateScheduling,needGetDateList,needGetDate);
+            }else if (beforeNeedGetDateScheduling == null && afterNeedGetDateScheduling != null){
+                resultList=computeEndTime(afterNeedGetDateScheduling,afterNeedGetDateList,needGetDateScheduling,needGetDateList,needGetDate);
+            }else if (beforeNeedGetDateScheduling != null &&  afterNeedGetDateScheduling != null){
+                resultList=computeStartTime(beforeNeedGetDateScheduling,beforeNeedGetDateList,needGetDateScheduling,needGetDateList,needGetDate);
+                resultList=computeEndTime(afterNeedGetDateScheduling,afterNeedGetDateList,needGetDateScheduling,resultList,needGetDate);
+
+            }
 
         }
+        resultList = resultList.stream().sorted(Comparator.comparing(e->DateUtil.getTime(e.get("signdate")+" "+e.get("signtime")).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
         resultMap.put("resultList",resultList);
         return resultMap;
     }
@@ -284,7 +278,7 @@ public class GetClockInTimeCmd extends AbstractCommonCommand<Map<String,Object>>
 
             }
             //排序
-            needGetDateList = needGetDateList.stream().sorted(Comparator.comparing(e->DateUtil.getTime(e.get("signdate")+" "+e.get("signtime")).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
+           // needGetDateList = needGetDateList.stream().sorted(Comparator.comparing(e->DateUtil.getTime(e.get("signdate")+" "+e.get("signtime")).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
 
         }
         return needGetDateList;
@@ -392,7 +386,7 @@ public class GetClockInTimeCmd extends AbstractCommonCommand<Map<String,Object>>
 
             }
             //排序
-            needGetDateList = needGetDateList.stream().sorted(Comparator.comparing(e->DateUtil.getTime(e.get("signdate")+" "+e.get("signtime")).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
+           // needGetDateList = needGetDateList.stream().sorted(Comparator.comparing(e->DateUtil.getTime(e.get("signdate")+" "+e.get("signtime")).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
         }
         return needGetDateList;
     }
diff --git a/src/com/engine/attendance/attendanceanalysis/cmd/LeaveEarlyCmd.java b/src/com/engine/attendance/attendanceanalysis/cmd/LeaveEarlyCmd.java
new file mode 100644
index 0000000..3b8842e
--- /dev/null
+++ b/src/com/engine/attendance/attendanceanalysis/cmd/LeaveEarlyCmd.java
@@ -0,0 +1,23 @@
+package com.engine.attendance.attendanceanalysis.cmd;
+
+import com.engine.common.biz.AbstractCommonCommand;
+import com.engine.common.entity.BizLogContext;
+import com.engine.core.interceptor.CommandContext;
+
+import java.util.Map;
+
+public class LeaveEarlyCmd extends AbstractCommonCommand<Map<String,Object>> {
+
+    public LeaveEarlyCmd(Map<String,Object> params){
+        this.params=params;
+    }
+    @Override
+    public BizLogContext getLogContext() {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> execute(CommandContext commandContext) {
+        return null;
+    }
+}
diff --git a/src/com/engine/attendance/attendanceanalysis/service/BeLateService.java b/src/com/engine/attendance/attendanceanalysis/service/BeLateService.java
index 841a25f..bec9783 100644
--- a/src/com/engine/attendance/attendanceanalysis/service/BeLateService.java
+++ b/src/com/engine/attendance/attendanceanalysis/service/BeLateService.java
@@ -3,7 +3,7 @@ package com.engine.attendance.attendanceanalysis.service;
 import java.util.Map;
 
 /**
- * 旷工service
+ * 旷工、早退、迟到service
  */
 public interface BeLateService {
     /**
@@ -12,4 +12,18 @@ public interface BeLateService {
      * @return
      */
     Map<String,Object>  fullDayAbsenteeism(Map<String,Object> params);
+
+    /**
+     * 迟到
+     * @param params
+     * @return
+     */
+    boolean beLate(Map<String,Object> params);
+
+    /**
+     * 早退
+     * @param params
+     * @return
+     */
+    boolean leaveEarly(Map<String,Object> params);
 }
diff --git a/src/com/engine/attendance/attendanceanalysis/service/ForgetClockInService.java b/src/com/engine/attendance/attendanceanalysis/service/ForgetClockInService.java
index e753511..f1d1a4d 100644
--- a/src/com/engine/attendance/attendanceanalysis/service/ForgetClockInService.java
+++ b/src/com/engine/attendance/attendanceanalysis/service/ForgetClockInService.java
@@ -13,4 +13,10 @@ public interface ForgetClockInService {
      * @return
      */
     Map<String, Object> ForgetClockInAllDays(Map<String,Object> params);
+    /**
+     * 漏打卡
+     * @param params
+     * @return
+     */
+    Map<String, Object> ForgetClockIn(Map<String,Object> params);
 }
diff --git a/src/com/engine/attendance/attendanceanalysis/service/UtilService.java b/src/com/engine/attendance/attendanceanalysis/service/UtilService.java
index 0b87642..cb9b93c 100644
--- a/src/com/engine/attendance/attendanceanalysis/service/UtilService.java
+++ b/src/com/engine/attendance/attendanceanalysis/service/UtilService.java
@@ -8,7 +8,7 @@ import java.util.Map;
  */
 public interface UtilService {
     /**
-     *  获得人员班次信息
+     *  获得人员班次信息,加班计划
      * @param params
      * @return
      */
diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/BeLateServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/BeLateServiceImpl.java
index f3cf6a4..1be88a1 100644
--- a/src/com/engine/attendance/attendanceanalysis/service/impl/BeLateServiceImpl.java
+++ b/src/com/engine/attendance/attendanceanalysis/service/impl/BeLateServiceImpl.java
@@ -12,4 +12,16 @@ public class BeLateServiceImpl extends Service implements BeLateService {
 
         return null;
     }
+
+    @Override
+    public boolean beLate(Map<String, Object> params) {
+
+
+        return false;
+    }
+
+    @Override
+    public boolean leaveEarly(Map<String, Object> params) {
+        return false;
+    }
 }
diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java
index 5a1ec25..0f9e689 100644
--- a/src/com/engine/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java
+++ b/src/com/engine/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java
@@ -16,4 +16,9 @@ public class ForgetClockInServiceImpl extends Service implements ForgetClockInSe
         Map<String,Object> result = commandExecutor.execute(new UpdateAttendanceResultsCmd(params));
         return result;
     }
+
+    @Override
+    public Map<String, Object> ForgetClockIn(Map<String, Object> params) {
+        return null;
+    }
 }
diff --git a/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java b/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java
index 10cee9d..b2a816f 100644
--- a/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java
+++ b/src/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.java
@@ -1,10 +1,15 @@
 package com.engine.attendance.attendanceanalysis.service.impl;
 
 import com.engine.attendance.attendanceanalysis.cmd.GetClockInTimeCmd;
-import com.engine.attendance.attendanceanalysis.cmd.UpdateAttendanceResultsCmd;
 import com.engine.attendance.attendanceanalysis.service.UtilService;
+import com.engine.attendance.attendanceplan.service.AttendancePlanService;
+import com.engine.attendance.attendanceplan.service.impl.AttendancePlanServiceImpl;
 import com.engine.attendance.component.persongroup.service.SchedulingResultsService;
 import com.engine.attendance.component.persongroup.service.impl.SchedulingResultsServiceImpl;
+import com.engine.attendance.enums.AttendanceItemTypeEnum;
+import com.engine.attendance.enums.ClassSegmentTypeEnum;
+import com.engine.attendance.enums.WorkForTimeEnum;
+import com.engine.common.cmd.GetDateCmd;
 import com.engine.common.util.DateUtil;
 import com.engine.common.util.DbTools;
 import com.engine.common.util.ServiceUtil;
@@ -13,7 +18,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import weaver.general.Util;
-
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -21,14 +25,18 @@ import java.util.stream.Collectors;
 @Slf4j
 public class UtilServiceImpl extends Service implements UtilService {
     private SchedulingResultsService schedulingResultsService = ServiceUtil.getService(SchedulingResultsServiceImpl.class);
+    private AttendancePlanService basicsetService = ServiceUtil.getService(AttendancePlanServiceImpl.class);
+
+
     @Override
     public Map<String, List<Map<String,Object>>> getSchedulingInFormation(Map<String, Object> params) {
 
         /** 班次信息*/
         Map<String,Object> schedulingResultsMap = schedulingResultsService.queryDataTable(params);
         List<Map<String,Object>> schedulingResultsList = (List<Map<String,Object>>)schedulingResultsMap.get("data");
+        schedulingResultsList = schedulingResultsList.stream().filter(e -> !"1".equals(e.get("sfxx"))).collect(Collectors.toList());
         Map<String,String> schedulingMap = schedulingResultsList.stream().collect(Collectors.toMap(e-> Util.null2String(e.get("bcxx")), e->Util.null2String(e.get("bcrq"))));
-        String sql = "select a.id bcxx,a.bcsdxx,a.sfkt,b.bdlx,b.kssj dtkssj,b.jssj dtjssj,b.ksdk,b.jsdk,b.tqdkfzs,b.thdkfzs from uf_jcl_kq_bcxx a left join uf_jcl_kq_bcxx_dt1 b on a.id=b.mainid where a.id in (";
+        String sql = "select a.id bcxx,a.edsc,a.bcsdxx,a.sfdx,a.sfkt,b.bdlx,b.zddxfz,b.dxhs,b.kssj dtkssj,b.jssj dtjssj,b.ksdk,b.jsdk,b.tqdkfzs,b.thdkfzs from uf_jcl_kq_bcxx a left join uf_jcl_kq_bcxx_dt1 b on a.id=b.mainid where a.id in (";
         String bcxxIds = "";
         for (Map.Entry<String,String> entry :schedulingMap.entrySet()){
             bcxxIds +=entry.getKey() +",";
@@ -43,8 +51,94 @@ public class UtilServiceImpl extends Service implements UtilService {
         });
 
         /** 加班计划*/
+        sql = "select jbry,ksrq,kssj,jsrq,jssj,jbsc from uf_jcl_kq_jbjh_dt1 where jbry=? and ksrq>=? and ksrq<=? and (jbcx=0 or jbcx is null)";
+        Map<String,List<Map<String,Object>>> overtimePlanMap = DbTools.getSqlToList(sql,params.get("pbdx"),params.get("startDate"),params.get("endDate")).stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("ksrq"))));
+
+        //考勤项目
+        Map<String,Object> paramMap = Maps.newHashMap();
+        paramMap.put("startDate","");
+        paramMap.put("endDate","");
+        paramMap.put("resourceId",params.get("pbdx"));
+        paramMap.put("modeId","204");
+        Map<String,Object> attendanceItemMap = basicsetService.getAttendanceItemsByPerson(paramMap);
+        List<Map<String,Object>> attendanceItems = (List<Map<String,Object>>)attendanceItemMap.get("data");
+        //日期集合
+        Map<String,Object> dateParam = Maps.newHashMap();
+        dateParam.put("nd",Util.null2String(params.get("startDate")).split("-")[0]);
+        Map<String,Object> result = commandExecutor.execute(new GetDateCmd(dateParam));
+        List<Map<String,Object>> List = (List<Map<String,Object>>)result.get("data");
+        Map<String,String> dateMap = List.stream().collect(Collectors.toMap(e->Util.null2String(e.get("rq")),e->Util.null2String(e.get("rqlx"))));
+
+
+        for (Map.Entry<String,List<Map<String,Object>>> e: overtimePlanMap.entrySet()){
+            if (resultMap.get(e.getKey()) == null){
+                resultMap.put(e.getKey(),Lists.newArrayList());
+            }
+            List<Map<String,Object>> resultList = resultMap.get(e.getKey());
+            Map<String,Object> overtimePlan = e.getValue().get(0);
 
 
+            Map<String,Object> map = Maps.newHashMap();
+            if (!overtimePlan.get("ksrq").equals(overtimePlan.get("jsrq"))){
+                map.put("sfkt","1");
+            }else {
+                map.put("sfkt","0");
+            }
+            //查找对应的考勤项目
+            attendanceItems = attendanceItems.stream().filter(s->{
+                //项目类型
+                String xmlx = Util.null2String(s.get("xmlx"));
+                //作用时段
+                String zysd = Util.null2String(s.get("zysd"));
+                //项目绑定的日期类型
+                String bddrqlx = Util.null2String(s.get("bddrqlx"));
+                //日期类型
+                String dateType = dateMap.get(e.getKey());
+
+                if (xmlx.equals(AttendanceItemTypeEnum.WORK_OVERTIME.getKey()) && (zysd.equals(WorkForTimeEnum.PLAN_WORK_OVERTIME.getKey()) || zysd.equals(WorkForTimeEnum.ALL_TIME.getKey())) && bddrqlx.contains(dateType)){
+                    return true;
+                }
+                return false;
+            }).collect(Collectors.toList());
+
+
+            map.put("bcxx","0");
+            map.put("bcsdxx","");
+            map.put("edsc","8");
+            map.put("bdlx", ClassSegmentTypeEnum.OVERTIME_PLAN.getKey());
+            map.put("dtkssj",overtimePlan.get("kssj"));
+            map.put("dtjssj",overtimePlan.get("jssj"));
+            map.put("ksdk","0");
+            map.put("jsdk","0");
+            map.put("tqdkfzs","30");
+            map.put("thdkfzs","30");
+            map.put("sfdx","0");
+            map.put("zddxfz","0");
+            map.put("dxhs","0");
+            if (attendanceItems.size() >0){
+                map.put("ksdk",attendanceItems.get(0).get("ksjbbxydk"));
+                map.put("jsdk",attendanceItems.get(0).get("jsjbbxydk"));
+                map.put("tqdkfzs",attendanceItems.get(0).get("tqdkyxfzs"));
+                map.put("thdkfzs",attendanceItems.get(0).get("thdkyxfzs"));
+                map.put("jbwdhlfzs",attendanceItems.get(0).get("jbwdhlfzs"));
+                map.put("jbzzhlfzs",attendanceItems.get(0).get("jbzzhlfzs"));
+            }
+            if (resultList.size() == 0){
+                resultList.add(map);
+            }
+            for (int j=0;j<resultList.size();j++){
+                String kssj1 = e.getKey() +" "+resultList.get(j).get("dtkssj");
+                String kssj2 = e.getKey() +" "+overtimePlan.get("kssj");
+                String kssj3 = e.getKey() +" "+resultList.get(j-1).get("dtkssj");
+                if (DateUtil.getTime(kssj1).compareTo(DateUtil.getTime(kssj2)) >=0 &&  DateUtil.getTime(kssj3).compareTo(DateUtil.getTime(kssj2)) <=0){
+                    map.put("bcxx",resultList.get(0).get("bcxx"));
+                    map.put("bcsdxx",resultList.get(0).get("bcsdxx"));
+                    map.put("edsc",resultList.get(0).get("edsc"));
+                    resultList.add(j,map);
+                }
+            }
+
+        }
 
         log.info("SchedulingResults : [{}]",resultMap);
         return resultMap;
diff --git a/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java b/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
index cefbfba..e16707a 100644
--- a/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
+++ b/src/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.java
@@ -1,5 +1,6 @@
 package com.engine.attendance.attendanceanalysis.wrapper;
 
+import com.engine.attendance.attendanceanalysis.cmd.UpdateAttendanceResultsCmd;
 import com.engine.attendance.attendanceanalysis.service.BeLateService;
 import com.engine.attendance.attendanceanalysis.service.ForgetClockInService;
 import com.engine.attendance.attendanceanalysis.service.UtilService;
@@ -8,16 +9,21 @@ import com.engine.attendance.attendanceanalysis.service.impl.ForgetClockInServic
 import com.engine.attendance.attendanceanalysis.service.impl.UtilServiceImpl;
 import com.engine.attendance.attendanceplan.service.AttendancePlanService;
 import com.engine.attendance.attendanceplan.service.impl.AttendancePlanServiceImpl;
-import com.engine.attendance.component.persongroup.service.SchedulingResultsService;
-import com.engine.attendance.component.persongroup.service.impl.SchedulingResultsServiceImpl;
-import com.engine.attendance.enums.WorkForTimeEnum;
+import com.engine.attendance.enums.CheckBoxEnum;
+import com.engine.attendance.enums.ClassSegmentTypeEnum;
+import com.engine.attendance.enums.PeriodOfTime;
 import com.engine.common.util.DateUtil;
 import com.engine.common.util.DbTools;
 import com.engine.common.util.ServiceUtil;
+import com.engine.common.util.Utils;
 import com.engine.core.impl.Service;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.icbc.api.internal.apache.http.M;
 import weaver.general.Util;
 
+import java.time.ZoneOffset;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,13 +43,14 @@ public class AttendanceAnalysisWrapper extends Service {
         String beforeThreeDayDate = DateUtil.getCurrentDateMinusDay(3);
         String beforeTwoDayDate = DateUtil.getCurrentDateMinusDay(2);
         String beforeOneDayDate = DateUtil.getCurrentDateMinusDay(1);
+        /** 打卡数据 */
         Map<String, List<Map<String,Object>>> collect = dataList.stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("signdate"))));
 
         /**获得人员考勤项目*/
         Map<String,Object> paramMap = Maps.newHashMap();
         paramMap.put("startDate","");
         paramMap.put("endDate","");
-        paramMap.put("resourceId","85");
+        paramMap.put("resourceId",userId);
         paramMap.put("modeId","204");
         Map<String,Object> dataMap = basicsetService.getAttendanceItemsByPerson(paramMap);
         List<Map<String,Object>> attendanceItems = (List<Map<String,Object>>)dataMap.get("data");
@@ -61,7 +68,7 @@ public class AttendanceAnalysisWrapper extends Service {
         Map<String,List<Map<String,Object>>> schedulingResultsMap = utilService.getSchedulingInFormation(paramMap);
 
         /**获得人员加班计划*/
-        String sql = "select jbry,ksrq,kssj,jsrq,jssj,jbsc, from uf_jcl_kq_jbjh_dt1 where jbry=? and ksrq>=? and ksrq<=? and jbcx=1";
+        String sql = "select jbry,ksrq,kssj,jsrq,jssj,jbsc from uf_jcl_kq_jbjh_dt1 where jbry=? and ksrq>=? and ksrq<=? and (jbcx=0 or jbcx is null)";
         Map<String,List<Map<String,Object>>> overtimePlanMap = DbTools.getSqlToList(sql,userId,beforeOneDayDate,beforeThreeDayDate).stream().collect(Collectors.groupingBy(e -> Util.null2String(e.get("ksrq"))));
         Map<String,Object> forgetClockInParam = Maps.newHashMap();
         forgetClockInParam.put("classInfo",schedulingResultsMap.get(beforeOneDayDate));
@@ -69,6 +76,21 @@ public class AttendanceAnalysisWrapper extends Service {
 
 
         /**计算获取前一天和第二天打卡数据*/
+        Map<String,Object> getClockTimeParam = Maps.newHashMap();
+        getClockTimeParam.put("date",beforeOneDayDate);
+        getClockTimeParam.put("clockInTimeCollect",collect);
+        getClockTimeParam.put("schedulingResultCollect",schedulingResultsMap);
+        //前一天打卡数据
+        List<Map<String, Object>> beforeOneDayClockInTimeList = utilService.getClockInTime(getClockTimeParam);
+
+        getClockTimeParam.put("date",beforeTwoDayDate);
+        //前第二天打卡数据
+        List<Map<String, Object>> beforeTwoDayClockInTimeList = utilService.getClockInTime(getClockTimeParam);
+
+
+
+
+
         if (collect.size() == 0){
             //没有打卡数据，漏打卡
             forgetClockInParam.put("date",beforeOneDayDate);
@@ -81,7 +103,7 @@ public class AttendanceAnalysisWrapper extends Service {
 
 
             }else {
-                //否则前一天记为漏打卡
+                //若为正常工作日，则记为漏打卡
 
 
             }
@@ -89,7 +111,7 @@ public class AttendanceAnalysisWrapper extends Service {
             //有2天有打卡数据
 
             if (collect.get(beforeOneDayDate) == null){
-                //前一天漏打卡
+                //若为正常工作日，前一天漏打卡
 
 
             }else if(collect.get(beforeOneDayDate) != null && collect.get(beforeTwoDayDate) == null){
@@ -110,6 +132,204 @@ public class AttendanceAnalysisWrapper extends Service {
         }
     }
 
+    /**
+     * 分析数据
+     * @param userId 分析人员
+     * @param analysisDate 分析日期
+     * @param clockInTimeList 打卡数据
+     * @param scheduleResult  班次
+     * @param attendanceItems 考勤项目
+     */
+    public void analysis(String userId,String analysisDate,List<Map<String, Object>> clockInTimeList,List<Map<String, Object>> scheduleResult,List<Map<String,Object>> attendanceItems){
+        if (scheduleResult == null || scheduleResult.size() ==0){
+            //没有排班
+
+            return;
+        }
+        List<Map<String, Object>> needClockInSchedule = scheduleResult.stream().filter(e -> "1".equals(e.get("ksdk")) || "1".equals(e.get("jsdk"))).collect(Collectors.toList());
+        if(clockInTimeList == null || clockInTimeList.size() == 0){
+            if (needClockInSchedule.size() > 0){
+                //全天漏打卡
+                return;
+            }else {
+
+            }
+        }
+        //请假记录
+        String sql = "select a.qjry,a.jqlx,a.cxjqj,b.ksrq,b.kssj,b.jsrq,b.jssj,b.qjsc,b.qtj,b.btj from uf_jcl_kq_qjjl a left join uf_jcl_kq_qjjl_dt1 b on a.id = b.mainid where a.qjry=? and b.ksrq=? and (b.cxqj=0 or b.cxqj is null)";
+        List<Map<String,Object>> askForLeaveList = DbTools.getSqlToList(sql,userId,analysisDate);
+
+        //出差记录
+        sql = "select a.ccr,a.cclx,a.ccsd,b.ksrq,b.jsrq,b.kssj,b.jssj,b.ccsc,b.qtcc,b.btcc,b.cxcc from uf_jcl_kq_ccjl a left join uf_jcl_kq_ccjl_dt1 b on a.id = b.mainid where a.ccr=? and a.ksrq=? and (b.cxcc=0 or b.cxcc is null)";
+        List<Map<String,Object>> evectionList = DbTools.getSqlToList(sql,userId,analysisDate);
+
+        Map<String,Object> updateAttendacneParams = Maps.newHashMap();
+        updateAttendacneParams.put("userId",userId);
+        updateAttendacneParams.put("date",analysisDate);
+        updateAttendacneParams.put("classInfo",scheduleResult);
+
+        sql = "select hsl,hsdw,lgsbxydk,tqlghlfzs,fgsbxydk,thfghlfzs,tybcndbjlhbjs,zdycbcndfgzsd,zdycrqqjndxxb from uf_jcl_kq_kqxm where id=?";
+        for (Map<String,Object> askForLeaveData : askForLeaveList){
+            //全天请假
+            if (PeriodOfTime.ALLDAY.getKey().equals(askForLeaveData.get("cxjqj"))){
+                updateAttendacneParams.put("item",askForLeaveData.get("jqlx"));
+                updateAttendacneParams.put("itemduration",scheduleResult.get(0).get("edsc"));
+                commandExecutor.execute(new UpdateAttendanceResultsCmd(updateAttendacneParams));
+                return;
+            }
+            Map<String,Object> askForLeaveItem = DbTools.getSqlToMap(sql,askForLeaveData.get("jqlx"));
+            Map<String,Object> askForLeaveMap = new HashMap(){{
+                put("bcxx",scheduleResult.get(0).get("bcxx"));
+                put("bcsdxx",scheduleResult.get(0).get("bcsdxx"));
+                put("edsc",scheduleResult.get(0).get("edsc"));
+                put("bdlx", ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey());
+                put("dtkssj",askForLeaveData.get("kssj"));
+                put("dtjssj",askForLeaveData.get("jssj"));
+                put("ksdk",askForLeaveItem.get("fgsbxydk"));
+                put("jsdk",askForLeaveItem.get("lgsbxydk"));
+                put("tqdkfzs","60");
+                put("thdkfzs","60");
+                put("sfdx","1");
+                put("zddxfz",askForLeaveItem.get("tqlghlfzs"));
+                put("dxhs",askForLeaveItem.get("thfghlfzs"));
+            }};
+
+            scheduleResult.add(askForLeaveMap);
+            if (CheckBoxEnum.CHECKED.getKey().equals(askForLeaveItem.get("lgsbxydk")) || CheckBoxEnum.CHECKED.getKey().equals(askForLeaveItem.get("fgsbxydk"))){
+                needClockInSchedule.add(askForLeaveMap);
+            }
+        }
+        for (Map<String,Object> evectionData :evectionList){
+            //全天出差
+            if (PeriodOfTime.ALLDAY.getKey().equals(evectionData.get("ccsd"))) {
+                updateAttendacneParams.put("item", evectionData.get("cclx"));
+                updateAttendacneParams.put("itemduration", scheduleResult.get(0).get("edsc"));
+                commandExecutor.execute(new UpdateAttendanceResultsCmd(updateAttendacneParams));
+                return;
+            }
+            Map<String,Object> evectionItem = DbTools.getSqlToMap(sql,evectionData.get("cclx"));
+            Map<String,Object> evectionMap = new HashMap(){{
+                put("bcxx",scheduleResult.get(0).get("bcxx"));
+                put("bcsdxx",scheduleResult.get(0).get("bcsdxx"));
+                put("edsc",scheduleResult.get(0).get("edsc"));
+                put("bdlx", ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey());
+                put("dtkssj",evectionData.get("kssj"));
+                put("dtjssj",evectionData.get("jssj"));
+                put("ksdk",evectionItem.get("fgsbxydk"));
+                put("jsdk",evectionItem.get("lgsbxydk"));
+                put("tqdkfzs","60");
+                put("thdkfzs","60");
+                put("sfdx","1");
+                put("zddxfz",evectionItem.get("tqlghlfzs"));
+                put("dxhs",evectionItem.get("thfghlfzs"));
+            }};
+            scheduleResult.add(evectionMap);
+            if (CheckBoxEnum.CHECKED.getKey().equals(evectionItem.get("lgsbxydk")) || CheckBoxEnum.CHECKED.getKey().equals(evectionItem.get("fgsbxydk"))){
+                needClockInSchedule.add(evectionMap);
+            }
+        }
+
+        needClockInSchedule = needClockInSchedule.stream().sorted(Comparator.comparing(e->DateUtil.getTime(analysisDate+" "+e.get("dtkssj")).toInstant(ZoneOffset.of("+8")).toEpochMilli())).collect(Collectors.toList());
+
+        List<Map<String,Map<String,Object>>> clcokInTimeData = Lists.newArrayList();
+
+        for (Map<String, Object> needClockIn :needClockInSchedule){
+            if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("ksdk"))){
+                String dtkssj = analysisDate+" "+needClockIn.get("dtkssj");
+                String dtjssj = analysisDate+" "+needClockIn.get("dtjssj");
+                int tqdkfzs = Integer.valueOf(Util.null2String(needClockIn.get("tqdkfzs")));
+                Map<String,Map<String,Object>> ksdkNearestClcokInTime = Utils.getNearestClcokInTimeCmd(dtkssj,clockInTimeList);
+                String timeType = "empty";
+                Map<String,Map<String,Object>> clcokInTimeMap = Maps.newHashMap();
+                if (ksdkNearestClcokInTime.get("equal") != null){
+                    timeType="equal";
+                }
+                if ("empty".equals(timeType) && ksdkNearestClcokInTime.get("before") != null){
+                    String clockInTime = ksdkNearestClcokInTime.get("before").get("signdate") +" "+ksdkNearestClcokInTime.get("before").get("signtime");
+                    if (DateUtil.getTime(clockInTime).compareTo(DateUtil.getTime(DateUtil.beforeMinutes(dtkssj,tqdkfzs))) >=0){
+                        //打卡时间大于等于最早打卡时间
+                        timeType="before";
+                    }
+                }
+                if ("empty".equals(timeType) && ksdkNearestClcokInTime.get("after") != null){
+                    String clockInTime = ksdkNearestClcokInTime.get("after").get("signdate") +" "+ksdkNearestClcokInTime.get("after").get("signtime");
+                    if (DateUtil.getTime(clockInTime).compareTo(DateUtil.getTime(dtjssj)) < 0){
+                        //打卡时间小于结束时间
+                        timeType="after";
+                    }
+                }
+                clcokInTimeMap.put(dtkssj+"|start|"+timeType,ksdkNearestClcokInTime.get(timeType));
+                clcokInTimeData.add(clcokInTimeMap);
+            }
+            if (CheckBoxEnum.CHECKED.getKey().equals(needClockIn.get("jsdk"))){
+                String dtkssj = analysisDate+" "+needClockIn.get("dtkssj");
+                String dtjssj = analysisDate+" "+needClockIn.get("dtjssj");
+                int thdkfzs = Integer.valueOf(Util.null2String(needClockIn.get("thdkfzs")));
+                if (DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(dtjssj)) > 0){
+                    dtjssj = DateUtil.AfterDay(analysisDate,1) +" "+needClockIn.get("dtjssj");
+                }
+                Map<String,Map<String,Object>> jsdkNearestClcokInTime = Utils.getNearestClcokInTimeCmd(dtjssj,clockInTimeList);
+
+                String timeType = "empty";
+                Map<String,Map<String,Object>> clcokInTimeMap = Maps.newHashMap();
+                if (jsdkNearestClcokInTime.get("equal") != null){
+                    timeType="equal";
+                }
+                if ("empty".equals(timeType) && jsdkNearestClcokInTime.get("after") != null){
+                    String clockInTime = jsdkNearestClcokInTime.get("after").get("signdate") +" "+jsdkNearestClcokInTime.get("after").get("signtime");
+                    if (DateUtil.getTime(clockInTime).compareTo(DateUtil.getTime(DateUtil.AfterMinutes(dtjssj,thdkfzs))) <=0){
+                        timeType="after";
+                    }
+                }
+                if ("empty".equals(timeType) && jsdkNearestClcokInTime.get("before") != null){
+                    String clockInTime = jsdkNearestClcokInTime.get("before").get("signdate") +" "+jsdkNearestClcokInTime.get("before").get("signtime");
+                    if (DateUtil.getTime(clockInTime).compareTo(DateUtil.getTime(dtkssj)) >0){
+                        timeType="before";
+                    }
+                }
+                clcokInTimeMap.put(dtjssj+"|end|"+timeType,jsdkNearestClcokInTime.get(timeType));
+                clcokInTimeData.add(clcokInTimeMap);
+            }
+        }
+        //当有2笔需要打卡时，可能会有打卡歧义的情况，歧义情况取2个时间点的中间值，当打卡时间小于中间值归属前一个打卡，大于则相反
+        if (clcokInTimeData.size() >1){
+            for (int i=0;i<clcokInTimeData.size()-1;i++){
+                Map<String,Map<String,Object>> beforeClcokInTimeData = clcokInTimeData.get(i);
+                Map<String,Map<String,Object>> afterClcokInTimeData = clcokInTimeData.get(i+1);
+                Map<String,Object> beforeClcokInTimeMap = null;
+                String beforeClcokInTime = "";
+                String afterClcokInTime = "";
+                Map<String,Object> afterClcokInTimeMap = null;
+                for (Map.Entry<String,Map<String,Object>> beforeEntry :beforeClcokInTimeData.entrySet()){
+                    beforeClcokInTimeMap = beforeEntry.getValue();
+                    beforeClcokInTime = beforeEntry.getKey();
+                }
+                for (Map.Entry<String,Map<String,Object>> afterEntry :afterClcokInTimeData.entrySet()){
+                    afterClcokInTimeMap = afterEntry.getValue();
+                    afterClcokInTime = afterEntry.getKey();
+                }
+                //重复
+                if (beforeClcokInTimeMap != null && beforeClcokInTimeMap == afterClcokInTimeMap ){
+                    String beforeTime = beforeClcokInTime.split("\\|")[0];
+                    String afterTime = afterClcokInTime.split("\\|")[0];
+                    long betWeenMinutes = DateUtil.getBetWeenMinutes(beforeTime,afterTime);
+
+                    String middileTime = DateUtil.AfterMinutes(beforeTime,betWeenMinutes/2);
+
+                    String signdateTime = beforeClcokInTimeMap.get("signdate") +" "+beforeClcokInTimeMap.get("signtime");
+
+                    if (DateUtil.getTime(signdateTime).compareTo(DateUtil.getTime(middileTime)) <=0){
+                        //该打卡归属前一个打卡点
+                        afterClcokInTimeData.put(afterClcokInTime,null);
+                    }else if (DateUtil.getTime(signdateTime).compareTo(DateUtil.getTime(middileTime)) >0){
+                        //该打卡归属后一个打卡点
+                        beforeClcokInTimeData.put(beforeClcokInTime,null);
+                    }
+                }
+            }
+        }
+
+    }
 
 
 }
diff --git a/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java b/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
new file mode 100644
index 0000000..298d080
--- /dev/null
+++ b/src/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java
@@ -0,0 +1,28 @@
+package com.engine.attendance.attendanceanalysis.wrapper;
+
+
+import com.engine.core.impl.Service;
+
+import java.util.List;
+import java.util.Map;
+
+public class UpdateAttendanceResultWrapper extends Service {
+
+    public boolean recordAbnormalClockIn(Map<String,Object> params){
+        //卡点
+        List<Map<String,Map<String,Object>>> clcokInTimeList = (List<Map<String,Map<String,Object>>>)params.get("clcokInTimeList");
+        //考勤项目
+        List<Map<String,Object>> attendanceItems = (List<Map<String,Object>>)params.get("attendanceItems");
+        //排班
+        List<Map<String, Object>> scheduleResult = (List<Map<String,Object>>)params.get("scheduleResult");
+
+
+
+
+        for (int i=0;i<clcokInTimeList.size();i++){
+
+        }
+
+        return false;
+    }
+}
diff --git a/src/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.java b/src/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.java
index 2e68f6a..0997c3a 100644
--- a/src/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.java
+++ b/src/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.java
@@ -108,7 +108,7 @@ public class GetAttendanceItemsByPersonDataCmd extends AbstractCommonCommand<Map
         List<Map<String,Object>> attendanceItems  = DbTools.getSqlToList(sql);
 
         log.info("dataIds : {}",dataIds);
-        sql = "select b.id `key`,b.mc kqxm,c.mc,b.* famc from uf_jcl_kq_kqfa_dt1 a left join uf_jcl_kq_kqxm b   on a.kqxm=b.id  left join uf_jcl_kq_kqfa c on a.mainid=c.id where mainid in ("+String.join(",",dataIds)+")";
+        sql = "select b.id `key`,b.mc kqxm,c.mc famc,b.*  from uf_jcl_kq_kqfa_dt1 a left join uf_jcl_kq_kqxm b   on a.kqxm=b.id  left join uf_jcl_kq_kqfa c on a.mainid=c.id where mainid in ("+String.join(",",dataIds)+")";
         if (dataIds.size() > 0){
             log.info("query attendanceItems sql : {}",sql);
             attendanceItems.addAll(DbTools.getSqlToList(sql));
diff --git a/src/com/engine/attendance/enums/CheckBoxEnum.java b/src/com/engine/attendance/enums/CheckBoxEnum.java
new file mode 100644
index 0000000..14a50fd
--- /dev/null
+++ b/src/com/engine/attendance/enums/CheckBoxEnum.java
@@ -0,0 +1,27 @@
+package com.engine.attendance.enums;
+
+import com.finance.toolkit.BaseEnum;
+
+public enum CheckBoxEnum implements BaseEnum {
+    UNCHECKED("0","未选中"),
+    CHECKED("1","选中");
+
+    private String key;
+    private String value;
+
+    CheckBoxEnum(String key, String value){
+        this.key=key;
+        this.value=value;
+    }
+
+
+    @Override
+    public String getKey() {
+        return this.key;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+}
diff --git a/src/com/engine/attendance/enums/ClassSegmentTypeEnum.java b/src/com/engine/attendance/enums/ClassSegmentTypeEnum.java
index 6f94891..ab25257 100644
--- a/src/com/engine/attendance/enums/ClassSegmentTypeEnum.java
+++ b/src/com/engine/attendance/enums/ClassSegmentTypeEnum.java
@@ -11,7 +11,10 @@ public enum ClassSegmentTypeEnum implements BaseEnum {
     EXTENDED_OVERTIME("2","延长加班"),
     EARLY_OVERTIME("3","早到加班"),
     REST_PERIOD("4","休息时段"),
-    DINING_PERIOD("5","就餐时段");
+    DINING_PERIOD("5","就餐时段"),
+    OVERTIME_PLAN("6","加班计划"),
+    ASK_FOR_LEAVE("7","请假假期"),
+    EVECTION("8","外出出差");
 
     private String key;
     private String value;
diff --git a/src/com/engine/attendance/enums/PeriodOfTime.java b/src/com/engine/attendance/enums/PeriodOfTime.java
new file mode 100644
index 0000000..9c1f698
--- /dev/null
+++ b/src/com/engine/attendance/enums/PeriodOfTime.java
@@ -0,0 +1,32 @@
+package com.engine.attendance.enums;
+
+import com.finance.toolkit.BaseEnum;
+
+/**
+ * 时段
+ */
+public enum PeriodOfTime implements BaseEnum {
+    ALLDAY("0","全天"),
+    HOUR("1","小时"),
+    HALFDAY("2","半天");
+
+
+    private String key;
+    private String value;
+
+    PeriodOfTime(String key, String value){
+        this.key=key;
+        this.value=value;
+    }
+
+
+    @Override
+    public String getKey() {
+        return this.key;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+}
diff --git a/src/com/engine/attendance/workflow/web/ProcessSubmitCheckApi.java b/src/com/engine/attendance/workflow/web/ProcessSubmitCheckApi.java
index 9b59da3..60cbdcf 100644
--- a/src/com/engine/attendance/workflow/web/ProcessSubmitCheckApi.java
+++ b/src/com/engine/attendance/workflow/web/ProcessSubmitCheckApi.java
@@ -35,6 +35,8 @@ public class ProcessSubmitCheckApi {
             log.error("execute fail,catch error: [{}]",e);
             return ApiReturnTools.error("500","processSubmitCheck error");
         }
-
     }
+
+
+
 }
diff --git a/src/com/engine/common/cmd/GetDateCmd.java b/src/com/engine/common/cmd/GetDateCmd.java
new file mode 100644
index 0000000..06454d8
--- /dev/null
+++ b/src/com/engine/common/cmd/GetDateCmd.java
@@ -0,0 +1,33 @@
+package com.engine.common.cmd;
+
+import com.engine.common.biz.AbstractCommonCommand;
+import com.engine.common.entity.BizLogContext;
+import com.engine.common.util.DbTools;
+import com.engine.core.interceptor.CommandContext;
+import com.google.common.collect.Maps;
+import weaver.general.Util;
+
+import java.util.List;
+import java.util.Map;
+
+public class GetDateCmd extends AbstractCommonCommand<Map<String,Object>> {
+
+    public GetDateCmd(Map<String,Object> params){
+        this.params=params;
+    }
+
+    @Override
+    public BizLogContext getLogContext() {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> execute(CommandContext commandContext) {
+        String nd = Util.null2String(params.get("nd"));
+        String sql = "select nd,rq,nlrq,rqlx,xq from uf_jcl_kq_rlxx where nd=?";
+        List<Map<String,Object>> dataList = DbTools.getSqlToList(sql,nd);
+        Map<String, Object> resultMap = Maps.newHashMap();
+        resultMap.put("data",dataList);
+        return resultMap;
+    }
+}
diff --git a/src/com/engine/common/util/DateUtil.java b/src/com/engine/common/util/DateUtil.java
index 69ad30c..0eb5704 100644
--- a/src/com/engine/common/util/DateUtil.java
+++ b/src/com/engine/common/util/DateUtil.java
@@ -35,12 +35,12 @@ public class DateUtil {
     }
 
     public static String beforeMinutes(String time,long minutes){
-        LocalDateTime localDateTime = LocalDate.parse(time, yyyyMMddHHmm).atStartOfDay();
+        LocalDateTime localDateTime = DateUtil.getTime(time);
         return localDateTime.minusDays(minutes).format(yyyyMMddHHmm);
     }
 
     public static String AfterMinutes(String time,long minutes){
-        LocalDateTime localDateTime = LocalDate.parse(time, yyyyMMddHHmm).atStartOfDay();
+        LocalDateTime localDateTime = DateUtil.getTime(time);
         return localDateTime.plusMinutes(minutes).format(yyyyMMddHHmm);
     }
 
@@ -153,6 +153,18 @@ public class DateUtil {
         long daysBetween = ChronoUnit.MINUTES.between(startDate, endDate);
         return Math.toIntExact(daysBetween);
     }
+    /**
+     * 获得当前时间相差的分钟数
+     * @param startTime 开始时间 yyyy-MM-dd
+     * @return
+     */
+    public static int getBetWeenMinutes(String startTime,String endTime){
+        LocalDateTime startDate = DateUtil.getTime(startTime);
+        LocalDateTime endDate = DateUtil.getTime(endTime);
+
+        long daysBetween = ChronoUnit.MINUTES.between(startDate, endDate);
+        return Math.toIntExact(daysBetween);
+    }
 
     /**
      * 获得两个时间相差的小时
diff --git a/src/com/engine/common/util/Utils.java b/src/com/engine/common/util/Utils.java
index 9ed593b..f30f689 100644
--- a/src/com/engine/common/util/Utils.java
+++ b/src/com/engine/common/util/Utils.java
@@ -1,5 +1,6 @@
 package com.engine.common.util;
 
+import com.google.common.collect.Maps;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import org.jetbrains.annotations.NotNull;
@@ -205,4 +206,33 @@ public class Utils<T> {
         }
     }
 
+
+    /**
+     * 获得time时间内最近的前后打卡时间数据
+     * @param time
+     * @param clockInTimeList 打卡数据
+     * @return
+     */
+    public static Map<String,Map<String,Object>> getNearestClcokInTimeCmd(String time,List<Map<String, Object>> clockInTimeList){
+        Map<String,Map<String,Object>> resultMap = Maps.newHashMap();
+        for (int i=0;i<clockInTimeList.size();i++){
+            String signDateTime = clockInTimeList.get(i).get("signdate") +" "+clockInTimeList.get(i).get("signtime");
+            int j=i+1;
+            if (j > clockInTimeList.size()-1){
+                j = clockInTimeList.size()-1;
+            }
+            String afterSignDateTime = clockInTimeList.get(j).get("signdate") +" "+clockInTimeList.get(j).get("signtime");
+            if (i==0 && DateUtil.getTime(time).compareTo(DateUtil.getTime(signDateTime)) <0){
+                resultMap.put("after",clockInTimeList.get(i));
+            }else if (i == clockInTimeList.size()-1 && DateUtil.getTime(time).compareTo(DateUtil.getTime(signDateTime)) >0){
+                resultMap.put("before",clockInTimeList.get(i));
+            }else if (DateUtil.getTime(time).compareTo(DateUtil.getTime(signDateTime)) >0 && DateUtil.getTime(time).compareTo(DateUtil.getTime(afterSignDateTime)) <0){
+                resultMap.put("before",clockInTimeList.get(i));
+                resultMap.put("after",clockInTimeList.get(j));
+            }else if (DateUtil.getTime(time).compareTo(DateUtil.getTime(signDateTime)) == 0){
+                resultMap.put("equal",clockInTimeList.get(i));
+            }
+        }
+        return resultMap;
+    }
 }
diff --git a/target/classes/com/engine/attendance/attendancePlan/cmd/GetAttendanceItemsByPersonDataCmd.class b/target/classes/com/engine/attendance/attendancePlan/cmd/GetAttendanceItemsByPersonDataCmd.class
index e789cefaa69405f7e28ec83d6f7413c7dac12200..a415caeceddb6c480c2de73f93473a313233a845 100644
GIT binary patch
delta 69
zcmdn#xXW=v8#|-r<aTxoMvKh{*e^0`uP;u`Nlh+MNYcwpQAo&6txV8K(#uU&$S$nN
W)ky}i(h_r%fnr(;n|E{n69E8d-WZPn

delta 68
zcmdnxxYKb%8#|-v<aTxoMw874*e^0`tt(E=Nlh+MNYcwpQAo&6txV8K(#uU&$S$nN
W)ky}jfLtwww8Y%x&3m~2i2wjiyBKBw

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/BeLateCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/BeLateCmd.class
new file mode 100644
index 0000000000000000000000000000000000000000..f6d563ce2a66efcf986352dd2dde5a50692d76a0
GIT binary patch
literal 1888
zcmbtUU31e$6g{grw&Mspgf=Z7Eg@|Z$4Mg^z5)&&LOMWZOvp5p>FZkFF`}}Rkyk+Y
zRdl8;9}f)A{2G2ir)Oo^Rx;Ber7zlh@7}%l>^Zvo;qSNa09;0+1RFn0U=piE%ud3=
z#S(tRS`l*vTq<I|h=me&FBfp7fU5#0I!ZUg&Q=&`^;`?os!L5b>^dswc!6?gcEf<4
z_Vj^s+j}v}tqbI~!nP8qG?}^+cUvlYC|f=w)6LM8{v#QA#!rJe{n+aXtY_;>tyR#L
zfvcR6DFf*r^t_(qcH7Qv)s$Lob=&Nh-|zxYH(0;gd?KGpC)S?t+?V_HrAOS|myztU
zL*>Y(z|3Jh2m1p|R}QCc^j%*D9cNERUeKv$A`e<ml&k9vBAM9pI)T)2#LKQ90dveE
z2690?S8l9X<YqNXiyKDD@hC~;s(l?s&K7l$K|7VHzH}Hi0hNtXqYQzS|5A_S#XS{m
zw~cfOvsnrR?13adQ4136`l0*VcJR>as;1ZDZ!?tvWFiJp&wZ@gv9Eqsz1U|?Wu)-7
zRz|41M^2^84OBfQkwy>q|Il~LJ_5Hsr%S?Q`s)a^56hBFSIc|hY_@tjlCCyFhe0a$
z=krn83uFE}cRVwV<>3si8f|TSfonEq@KpipHm>7F0d*T2xXIMfSQ!~@oWnN)SNU@d
zUWAc|pPX2M<;+2v<|+Bt%L<HD%}ksaLEvOF$`?vtAsw<To9Pr}LjtFsDfv`IPDceQ
zlD_i`p9q1;Aol&W{z!kiSUUQ+z?ahIy9(q$U?}rjp|`?SaJ9rs^Tiau`6N=tN!oUQ
z7t=UJPmu2~nPpD?%GKgps=b1!E&mDYcY0$<g)&#r%CW`-&zedz{p_?7&l%ZR@oVn&
zyO_vnM$Rx|;VdmmM$2^j$hE+AxAq6D>9IG+S$K`{`-z($xH}p5JqkB+iC;{%jX$3F
z6GK0r+`5nX4DSshsu07s?7qt04V=dgzDw}m>-Qhx-(}W$Vys{jv*g#JzlJ$lV>~;@
zQ{VIc4d&0&8fP5~3$*gdjc12hi^HtNVb&tE`YcqZHp#+L(g(Q68iw<HZTT;hjw&{p
SQ7oV0w9+~?Ec2X&m45)PDc*ws

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeCmd.class
index ea682d847e5da6181824fa2e65c3263d2cded15c..154cf225fd5147c5b234371ef6e46a5ae65ee018 100644
GIT binary patch
literal 14342
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
K+Pz3PfAtr<52*V9

literal 14542
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
A-T(jq

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/LeaveEarlyCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/LeaveEarlyCmd.class
new file mode 100644
index 0000000000000000000000000000000000000000..747018704a62ed2829207f8fca30691c85f3b89f
GIT binary patch
literal 1325
zcmbtT%Wl&^6usl52?<UU0uAp+fkhq_W&sG1P*EaS1y}?{Y$x`}Ol6NFXHqr&Dp&v#
z3qF94LY#>m)d@lhW#jwsz2}}ebLZ!;?>~s>5#2A-7TqdQo^F@%xl^RwBHd+F=t(8@
zKBIbbaLA9iGt)9~-tbAcHDZ+SN1k9*9Y`hK&cd;X-}7;ROnnf!JQ(p<nmA47^+!2n
z)El@_=m_Pb$>CZH<#FX^U9NaApUSD@hMqGJ{7AgwaWL<PUKfleJmw*As%wN8HCCt2
zC(Fr?S4(?I7;xn~Lmf-ycQcuH<3r)<?mlLfhSFDD&te?u>6!o=f*6@9zR-in??+0D
zW6h}DY-Kfo9ATuOh?aWpyp$)Wwct<`$HJXyFnHcv?TUpXff&1DqNCX91BNRvoziWs
zo*78nX3%K`qrHE@W90tN{0-$|^x`a27FU^G93yY_Tnlx_^29k9Pj$>)ZIp^ss#i*E
zxz`)=G}}=gMl*>2S|%Hx-O~r=t=Lqcdp1>Q+om0AFnWdyIOF0o>SUVXnvMDEnHc4o
ztr6|wC2!$*6D%GM70IG=h(5qtu;unQV(rcsvOXiqQ3>B|Sfcajun||NjHr=RBWoi<
zpE(l{tMF~uBvXTT0lr0bco*pszGm7Utf{fsr^R10rLf4<7U&6rm7+5v6);Ta6I2<V
ze|GL<cr824<jZsgJqe4ewF6*XLu{}f;;+Ffv^!rZx6Y)LVNyt$SSikRx?wob&EJzf
BRj&X5

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/BeLateService.class b/target/classes/com/engine/attendance/attendanceanalysis/service/BeLateService.class
index 54e39a73bf21d7e70390bfce947c1ecd908118cd..e08d52f648df25f9a623be0ff0eacab0caef1bc3 100644
GIT binary patch
delta 139
zcmcc5^psiP)W2Q(7#J8#82H&4c-a~FCJJm-U`tB%Ni0caWDwHu$x19s)GsZ`%+dEv
zEU?y$Vq~z;nAm5^4`OlUq$ZZ7x+WIoR8BnHXwA&R$iU3N!obMD3N(?4fepxKXW)SI
QIe~mGWIj-a8?2HC05)(KU;qFB

delta 56
zcmaFLe4k0+)W2Q(7#J8#7`WLPIN2GvCJJnwtj$<2&B(&Yz|6qHz{tP~lxAXJ1G3n`
GEDiu~4G2~M

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/BeLateServiceImpl.class b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/BeLateServiceImpl.class
index 06e4221c4d80971b3543822d34016448e5434a97..44440bfed078bcf505463180fc1120971b356d8d 100644
GIT binary patch
delta 192
zcmX@l_K`#4)W2Q(7#J8#805GZm>Hzl8Kl`6WY`&GH%e?|lxIsy^+_yAWn>W2@X1On
zOVlqd$;{FBO)Rk1jACT4m>kV$&Ie?0<)kK-rMe~-<y1~S&iIItW%4Sf1<IlfObqNm
zqdgcHfh-0FCgwFjl9_=6NU{ON7#Kt*^D~=jiUHZ;41`rnf>d*ZR7-$NV~_*@b9Nsb

delta 49
zcmey!ah^@$)W2Q(7#J8#7^Juum>I;_8N}HcB-j}wH%e?|oUG6EfRSmk0P_M?1_mYu
FQ2;z;3V8qk

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.class b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.class
index 9a5e1ccd79fd9bb041a9ecc9464f3219635df632..2b46ea765da89c716899588ca3cb2eccfc77fb11 100644
GIT binary patch
literal 11594
zcmb_i349dw^?z@V%w#ixFyvqXaZx}Lj&KQ>0Lm$ma7e=Cg|oYpWRuNqva^8%#rtTr
zwzi&NrS+t>wpD~cupYJbtUc8BZ?#ox?|QVh9{*OY^!xkG>}ECxVC{!6^M2R+z5Bi2
zZ}yo_4n9mov-tf0T|_S{^s4~<nqE=p)qJ{uUQ_5d3cW7C-xiRMey7s!3#f$tpwJ%+
zNTWaLSo?MX{gwU}pm*r+0{VweOdsgvp$|mgKNb3yN*}89ky!X~0sWgkDWF44;=u}g
z6!r$_7<w5G_7%`*_A8vHvLf1QfW~sZcmz}~P*@9aArH~XD{*sCfQPZJlaEV*m&;Th
zp>j~=kt&bU$xk0(OFl;BF)AOca;Sh59;@<k0Y09`sXSibodDkW1cfICXg-%0a0O4&
zDNoR^U=N<km4c*cV3wz=JVWJ~0Xl(aseGc!vsIp>lgcNlT%~fg%JWp7ukwO?KABGm
z;IUBUMJg{=d5OwPRbHm@sVXm5xklyFR9>NSt;#C}>QySQR(Xxer>neHbkwO_F9fhI
z!0UNKfH(3c(S3%X_Dq$}D&VvE9ECRrsFllAx<#d@RC-#aXY%=6HUfAo6x_|q=P*YC
zcq|l9RP>oDH>ljGa+At2g_{H1!f}OL6;3dD<H<%Qy*8O@thC|{vzjYwlZ}mLs+wtp
z6=^b~9r0MAajj`}#M4%tnc5PIm`tl`BgxiEGtn4Jn3YC4Z6=~dB4Spew=J146Y0t}
zGi4<cjj3cuTcu?$tE?LYANCp=Hmq30GSk^DmJG5*?`~~zBay|uFiXT5bURppIB#Ao
z5lb%sqZ7;5Gx-)Lqo99iEeK!L(Hb^W^+q_39!MZ!#Mc|Cm}onlzI0Q}VmkGRq!<Y!
z-etwCEIF~(ws_^bbS&;rQiHY-X(KqyN}(pPESYLG(y=5I5t>-rY-}+qJFuv7rO{Sh
z-lxsvhhS4(crUfzT1_HhrWVHy%Q8V`N$!GiauzoAw^&y5bitzB0ODz^tV^e$*394x
zXVOe2ZpQx_ra(%nyf$W~nTlMPMGw|#$t`9o9cwj(xP?G-iHE#fjW(cyX!F{Pl+g+T
zi~AWA_ypbky6s&Hd;8@)uhkxBQo@nW&YCFDsZk?s*i#h&%1QY)-4Y(^rcw5&k`xIJ
z>ougBwApGe$nC=(`9N&05%hx(8#RomcT-cYE6p{YuC|N;Rp*MuR>{2ndg$M?05U$+
zwOVZHEX-KQ;qj~vH=B`k^#c53I?;s*6d&bErncO5N1$I4_E`x1)TBCQEY>yWk~%1h
z{}Un$>(WM~1(KA30x=ai4;d19OyML_91N!})|fET9Vs}#ZGBvOP}-zxW);^b01Ue7
zf5OoaM5e{@WTd4gQ4g<X8rz5HoOmRZ44GfhXU?D`4$jzTF&7XSH(J9{W87e2b=+L0
z*?ou{&?ozJR+pcF*aiRhb+*Pk@!Hm9MMdn1MpNygL&P4l9*%w#G|XW-zAp`qZgXSt
z5xJRt6uX^x6mw=BQ7V1p;p7sLL61n}%%hltgmXkZ$XG|5GYwg-pJ<^vbzTHzi_H6h
zx@1QxVlIn`EML4XHziLMSxckO(dU`g{Wm3z%=5h&J-1F0NnhbMjoUfJG)NKg-<3=n
zT}GEPtr(c*-ZYj|BS~ThER+PLOp87hwgC}obOl|hu|?OyX+%=iIL#eQLwd^t;qe-8
z;jO4E7A2EuE1fdhR+{OiWYij($DKvoh1a$s`ag}&<MS2XuJHwYp~4qwd@*05@uhrO
z5qDtD<wf*kjj!M<0e?>8&+}DGg}oce)clfV#*qg@#?)9eBua<L##A$EMeqtotf*{T
z4N=i;HMFEBho^?4@lL$9MWdY!+W<s6n=HIU5fzH2#S5)wyCq(7EZQPF<tyDDZE4sh
z)})&x6lzE%TSFZUo0}u?%`NSl1sNeD6gL~vq2^>P(PwCLG(9~O4kZ(k==tHPtp;p4
z8rs@qrc9d=teMD!^TE~p1%<EC_>24{WFC#L<u7ae6~2yXc#a@!2WBdhy{@pcs3R7S
znkkL1=NmM>QLHTLI|rd~vc@;@%^L6Eof_Z5Uu7Cr9!jRLG8FC#+0w~bX=gEoZ`F7g
ze+>%yy2iKh?F!$a@tu5E5#Noz-9`KjjlaqFX#6d{7x~0dR&zMjHMzw~wc`N+Hw#FL
zx;bn``bx7o+}tEZX3Iycoqux3NJK*d!vYsP&w(d4Lj&`tf&P$yLNP0p=!nP5VX|%E
zD5875l{Ql8B?$3|`8eAM2;_cS<L~fy?b=udl^W!PyjGkj1mK-9ZI;IO3Cs5+q6*)y
z@g9BvvYVpuUf!p1H}6N8@A5H#t;s}Xq%~T3swuZy+!{qR;sXlzXnc?##HQcF|A!QQ
zSmQ_dQH{UP*9n(;473XN@DkF|_y>%Gflrt)c0}mpX;}9|;X#k1UsxPSwJjcP;Q^R4
zR}8`26@EhFC;2I105@ZvZRQvh;+Jh9eYBldixq8=E%8zudk5Py5swwe=rJz*3af2T
zLR)x}#!vH3NVvsn4u?Ct1cLl#7c7u<!SO8g3rrH$_!+?-hlH8_Na1HS{xSbV;h$>!
zGk#8tKCjUwbScw_ez7=I6*}|0?Pn|eg2q4RUob6jX`nYyx=yj#!<?fSS6Kx8D2%xD
zBL7n1mo$Evf2HxS#p4xz6&%{dfk)~k9FZ@pL5P0oQE!?#EX!csCtWH0n#RB3*O^AU
z@I{g-vr<ma9-im9h7ZqUW;@qT$f>=t181X@kxn9i9p}OcP*|?4Je^Gi0=R~##4@)8
z)1A~T!;L(qqKM4F(uZ)AltbD(%v2W~&T!7)USMRJ;6~+C$nF}->4LQ(otWaZHfo}~
zeztqXu@{5Y0sbxj4hPSHke(61jmz($%d{zuzM&j64IPPyIIdT&Ntw}D1YrRr+c8zj
zB4-;A(-4b8eoQC1i<AM73{EN-=~ae<esMA`a#}J4C&^1EMM7m7lS63VnIKb%*vpuv
zxvA+la{#dlk^BL71V&q19DaCg&Q@7=mN~+y7SsQT>FK0Q!5iJ%^`GrJxAh+!KrmVE
z!ILU)MCycv49g)3T^M#119FZU%UW}3&h(6x3o$hr)+)0T7;$5SQqq@@jpEFF_fZDo
zhe(hhn5MXGsm{J#aZA$fa<VP9$%9$1Fd<AeowUbLo#yP}Ai>l)F51#fk|5m7<XatK
zOK!kaI<cmv|1Lm3CdbWsopnjLKADWeZZzSj?eTiYdgcs3{+YIB+zh+bA<uw9)qfIh
zFE09UqqGPdRUcm8ZXDnP{#fZ&sieFynQV;9>qMC#ZNn9}VxT;bFt;u@tR`t&B^i-P
z_j9_z|A4N&UQqjIBndZxK;t^y<Qb8O*#_m$?=z>*fhgxRoHg6U$%NI>Dlbo!hGc4~
z5rNinF82CQEtgdN1=?-vz`k?cig2RZpn7nthG`^J+FO*1OD$_r*BW^bi*j(QY2e1L
zveCqqp<&-m;!0lBJu@=)ccdVjwMf6!7LS406Wqi)qvdY1$*veGG6rh0rJZJ^L#C4{
z{WC!V-YKM?Ou-^@rbDCs&v`hEPRcQJkxd520oOL=?kMUIkB?$yM#*k53ln-nJl;ec
z6gUPpRpA`M%V4VuQz@g%j?rZ~)|wpvcPezZ-iUXAwvvfCF5R2i%=Qi=Zi&6$Vp?)|
z`^=d1K*80WyQaCs;3^c%L`SPtDN}Zx+1QFGEABd$q8CAR_4=i2>uXjn-MprD;VPyX
zZc!c;4)E)<V%xy0*NFCwodYCy+lqQ)r<A+%@d5N_D-ltq+hvFXaoX2dhl$JL_8MP1
zaP2P^is>NCPUiiG5O=W^u8+<7BvZK~eK{}Elu9O&m5b#o7hgHzHDdGt4h-Wh>if+F
zVu>XhfPNsq8W_in!|5+K7`QaJVfES-n=@);nsrzW4vYn&aywr?y>CdSTJUv4NYyqQ
zU0BQJK0D_Gfg|A%ZnChpcC)ZOfRSV(je{|~Y?M0;Ep9SWb#N6E-=pL;URhr;FEd2#
zghZ7OE3v<JF^$i`AwH?V`}?k}R`_j=|H^;Y=oh%2pr7OZfnE@g=f&e^^qfXN70^$_
z<5}@|oSs1G+<T&qCAK76V0QA}61N^kLx!4y*4~!F?;`KlCX+24ZA{O)X>$<R7beRQ
zQsbsI&YtPyC>gGt$m_D2oQ1*|+|!SK(BAU!YuzP@gL$zLkJq96f(YM(wEGEUAbwEB
z9DW{+#dqq9@b&p(d>|evPJsA2?GaaF@{Ow~ybCdo3qCxrLTfd~adSe)RO~0N&^-sp
z`zZPLk-tLEld!Un)cfV~tMMEH#01nn8bw7kn!bRRW+R|$=!<AEeTl9GQXtQtjt|MB
zi2Tbd_L6^659NDk<zzk3Lj@jsl(bb-dZ>`;Ah1#o4fW6gD(azOxnuaievpO}#)_S>
zk}98GTIJWvs`7%q9vZ<|9Av6ef=UmKWZFR|3TPB#kI_}?gLKTM{WK<+*G<O;)gB6o
z{;_E2$KlaU$5-X;KJ;WT&nsq(^F_O9d{tg%kzXtlEA<J^WPi}_eTYstKoji^B?IMx
zzKSe;>H(Tml`l2}al!nc?;uSUEKc!|KD7!M@_=EJcamNyMNzlOH%Xu7fc{DPbQ{DL
zj(le1q7Ml41;GM+nqJmJGrhC{@N^eED}y;ZdZIqthM@^HSkOarJXECxwO(aZ6$-3F
zf<yGV8Db95NqSW`ReNV-*Uo#8=5GoP*-s04=wzX&lB%J>p)M>%L8ws5<P@Q}g}I6w
z7KHM%3e$tStuXH>0XYgA4uK7qYLa4jl1j222WXMQQO*>YQdO~7vskEB^Y+jZo3s+a
zQfaV6Un)@nSSEpPI&~-M!BTy>USlKNO+#h#GzWj7WFj~$IQ$^3=x?1>g_vEdXJ(h`
zE3?us)mQ1O9W15#nmu%SH?7UK>p(-jq#@h24qfYWyEeEmZ*;+%^fR){&UC?Nx#pbh
zg3rmq;Ab<_F0w%PhG1b<MEbe8J8yK48M$Md++*R~u`}Ic5%(Cp7CY~x!eDW*w1=V|
z+TfjCR#FzU2X5!l8DF!N?)auD9Iv<p_HFA@uaii-sX=(`h{4xn<m=1~4n7muebIsO
zj|`4DK#jp59^KS*3#Ec1UF};bEYu$??iFLLn`M}Tdu(Oy*edtfD)$%&5+aIu>9R83
z{mHAlKYo1=HR~<G{2q#X5lHSseDx9HFi)Twz{le^MB}K8#?wriKx^m(s;7yxk;>_O
zs-UmYB)T1e=YE=k+&h(Cq)Pl8X&Svx(>Xx1c?iwn)l|jxRL$qoJdWcBKo`&gzKTxf
zo9Gn2ix%-c@Tn(g3BN*1`Au5p$)_666gthbfL3_c&`M8)R(U$<bkBBL>$!pIJa^JM
z&waGf^Efqlo~M}SRciLUK`ovSz(5|gdV`ekPNt-HF12}=P`h^xrMzd6<!z$0H%%Sh
zi)f4YD%$G3n>xLZQJ42s+UEU`&iDCfyKe|x=sSik@|{i>`_7|FeD~9(zUSyN-`jM#
zKcBAfkEbjB)96C~Y`WTi5?$k8ihP9p#6`$K=R;Osrt3+?>euK7x{*cz$3D6VP!O0d
zq?-Ya^bO<j$R9hY%oFjvK)29Wso2x$d6;g6@0579dwL+%T~z9s;?1Y810NETf4P(S
z1auolag6lOhvau53zqq((;dL#r8T~P(w*q@QN8ayx(mDcX`}BQx*Jd)z36MF-I%A)
zJHCzd4a`&NeP11Y6Hq>{_Wq0R0TkeR?|bwuKm~l0_kOw;kj8g;@1SpEZ6V*|-9_I)
z-w=Mq+d|(3G?d@;o=x{*w8)e1JsGyJi-yr2*v>Ol>`3JSQXOvhX1U#$<#u0|+ir*3
z+aR|LkNdJb?#=SJA3WOp?9K9XAj{8zEI$Xb{Orr}voFif-Yh@+vi$7J^0PO~&wlXJ
z1AZPS?GQDPs?b4&9+ZFIlh20~!XJL)_aRju;xr8(WQIN4Ug=&B*d79kk7=$#k9<OP
znZ5@LKH{3;ACrea;xUJy($9kZLkROxu;QWbL%@&G4*-c8Z3hJE!~1w7ZzSN>O_TOh
zB9nhnP$gv$kp-2A5MB`>oJ#F_{N(Tkl!Z6SO0B|1ld)I$gl(@Sm@TZugP9&_^<HTs
zAzAH-SwiFXETM6GmeBa4*vUgbEDDIi9&-e_|3;63cVe>MCMiQ5v1+p3o`I`;ll4@#
z;jchp7!oy{EDFa~<xSZ`RyU=)sbdFC3i|fYmTuaL)=nBGTAg-l2Qs!_lxAH!$nU$?
zdoOmhIUgf;KLd5?Srnvm5E;*<ITWU5icp+PDT!H76)2=9CD$58pMs1KV`&{d4akR8
z%i$x!OXuL<j{xOKJ3E#<hk#I#w)Ke1!i1d>6+jd?=s2R74N-{dTC32vWjGcp@<<is
z$+2awB3eUG*+m2#I5G9dao(rHfumP{9Cj%LmGq@!&VY2_4Cmlj4)Mt1zhctlUX1}n
z)n!*Dy~l(AI3$_@an5vM9VtVm2i)O!*q<^xhYmnlr3*)|gmBL6kK_EoBs5__95}G{
z$1x}!1LMHS*TJy@@)6oD)oUvB?UE8{wu)~z`CJBS>wUb7qEcJ$(!l)WDLw_~dF1QN
zA#JQgivyK@!2!DP0csYKW|s{GvGXsbUA;ut;VpiAJQ@!BmAriZ8~=mffhPWp{<A2b
x{(`x0(3|v@gx;n1P!Nc|cj^B#5D&E>9?r#FVvq9Z?C9hyG{u45;JNhHe*gz!lz;#L

delta 2308
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

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$1.class b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$1.class
new file mode 100644
index 0000000000000000000000000000000000000000..f45bd05472963359cebab2ca63ae331c2d735f75
GIT binary patch
literal 1971
zcmb_dYg-#d6n-b!l1bPWy1gh~YFn{}?IlpPR$I|XgQWyeg5Vt|yOU&-%_hxmXyAGL
z0saPmgCFz}Dpl+CgOA_*>TmEjRL^VzY}@dS<jFa6-gD;6%sb~y{(5llK7f}|P2vn*
zRpP1=uPO0*3TJVR<N6@pz+?h%4ua#Y6nU~7Z*xp>+(;sa=@f}~IBs&xaNOdU<;Zi)
zam;fpaJ<X$9>*d_fn$l|eU4?06^;)Q_%MNw7>qUHj`~(b+HF@ZO26#}48!@VSQD9c
z;JBH*;|JFmj;T1|*QOh-ycBElh6n`1P$Y0pH2cKO1hURB5L6t0betidw;J_~^vaGW
zGa?A2XA94Y4uvP&b>HzbcUq#^l&ws5H!9n6t#m!K+Q4<kbAm~RFVY8@IC84+_z_#3
z@)2`vnL(Rs*i!L9=bCTVi?X#OiY_5WzF`S>S+pEw_dre2!JyB0o@`CI!uKVa^9Oi@
z(FtNFRcN$ZmYjCfMo#U^<0W<3wD+86xeed(%5yTPH0%UE*6|5G)se=Sj^{C|;{}}4
z@uCtYKBH3?txhL_RUMy$G92Ek8lp*oMI9Dwx~HP$+no;0khX8BiMC4<rH&HHIx27|
z#tv$}UnOT(kzMWDJyrAV8Urtt{bFZb4Yg_)ad(kKaNDkxHi*pF6{@yGQ0bYPU$SX=
zHbLub*mkG1!H^7YyXA@-hHG}GLbH-VrL+Sb=xs0@-6Q9w@GC?R!>xmB1|nvsa~M|A
z-4b<$SI!iI7TsyDXdg%Rnmkh0k5+wXt2&RTl{~U{7UdzhEJ>b7&x}PDUMN<jrQVKn
z(e3omzJc*(o6=nE6aIMGz6r+r6DqxS-Oq%LR*>bo^n#`JrpysaMVl?mu1+s3uI6*u
z<s8H1eeQk#9O@mS^Uun4hU4kzzIxQ-G`-tr>8;m>hgBZ|q^XrcP2Ch~YBGvo^fPgu
z^aV0%&~S*5|IG87VCIEQ#LSDEh?^tYCN%Rd4w=S)`5j{MZ6sp&1>6|eMlyyiq*hF0
z@L|_r#HBy%(j%_J-{Qy?hPo++DK2gtjkt{vITk^V6QUU>BFM=Qc_M;5X^eCeKD9G=
z+IXgmJR1g|iUdCwBByteZ-{~zE|Q$Y5Xmi!;4b}fevbugql$aDgCFoEe#BS!318zr
zex~oA#K+(G760Hj{EOf50Ds^T%|1!Fh*D%QL0XLz^;E;SOjZmpQD(X-yn-tjr%{T0
IXGqiMf91R%3IG5A

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$2.class b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper$2.class
new file mode 100644
index 0000000000000000000000000000000000000000..7bf853093768273fb163a2641bd333ca3fd1fe84
GIT binary patch
literal 1965
zcmb_dTX)+;5dPLy<F%tUsb~w~QrZ%Vqh6E-D20}QNu4&0lRz92?m?E;mTXyeEje{^
z4nKh3z;EE898yks03JDgE0=PIKfrG&%*sxprpa4!PG)w#nVr>qJF~uX|Lbo6ynt#N
z$MKRB7o>PuidQl?fr}iM`td5pQ+TZ(9It1{ljC@UV}j#y8hK1+NL=B#$}z=pjboal
zz%j!y%Q46CCdXSG^BhHv1&+5l7CDwU-bvxz6y9UdR!na=upD8xJuxqWwihxC7OLio
zX|zMvGYW1HUL;7yi4|dmZo|K9h9<*6ENaGVZV#FYMV+B9blhNgl%Y_t8g)bX71tMr
z8HU2QP2Y+yP2coZ12-^kw9IBxw2a(lRIcY*>U!v?zDus}hT{yMWcM<0tfZ*$m@P}(
zW{xZ}C=(4^NHVCd*>=4oS_@{$BSb4SEYn*wTduTwpd#sDP^Wxfv?e?=2n3n4dsxEo
z7_pNnHrg#qOuF(zj_%6iS$WO$?Rnqw8iDIqW<=;T>=fQt@c}+mk;RCLXE3bdS)5ey
zoD@1fqN+<)r<206ijP4V_HXqI(Iml=3JW&fQ^^YKPKR~~JFw(N+oO#_MHv+p4qS?{
z!&(qj$=Ow8SG#sk)dIW5z{{1O)LE5FrP@WjO(Ydww`=7!A~SKGx-AttJyQwFHXYB-
z(K&0j-6^jzq{Hi8#qpwW#qKz?D;+xJ4QNkqgW=#7IakfVA%YmL?cFdCF&mS^u$1k#
zsAu{WqZqd6PJ2!JFtRn?v9{jc^^q<6Jeig9z*a5NLvTfqJe-{xi5)yws?tM2eRwkd
zIX!g8z+|&cX)f##{&3nI6O8UmsPNnMz=#H|C@OW~hYPDsktdXzHdmZpo}8OsF648I
zd4{oF?tS+h@*Sf3r^PD6p=|uSdeq|>z1Sz{l~)D_<s1Q|X_O*O(-dhMGKygIuj3Ty
z(`3}3U>_m>>8IAg^waA|=x5fE)Q6OHDEe2}r)z!smq;XUBbC5+;9B2pq!YM>%#yD4
zKj`X@xzq<;YRt9&3mmwGfo_UHic4w-V{R=%9*H4`2vM}dG2}>uJQ_nD(}ubUAKzF!
zp*`6}o{EBx#)6-YkYk(3O`;%yGbG0`K=Lkz@B{s1{)jpJgerc<4cx=0_ywQgSA34&
z@GXAF_xOV%|D@Gl_!ocUKK{X3+I@s_5v4G2j<j4!>Zyk@MpgpPQ)ap<yomD{rB#M}
I$4S%Q|16FkuK)l5

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class
index 105a8bf350f883d845ccc0f1838444078fcf3613..e82b89dd3399eaa0dd8ecc4bdef82ddc3b2d963c 100644
GIT binary patch
literal 14122
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

delta 2016
zcmZ{kXK++i6vuye+k3oySvF58ix3DYCIkp5M2HPS4JM#QgjfhmvV<hCi@S@0g|&bp
zcAuc4VyscDNJ~IK6oc4%FDO`N{NVV(@r!!iZd@51XWqPf+CBes?)l%lDY~sJ_39rx
z_W)z~$)J*`M$BL-7iq+MF`k4*Qe&ATUaWD6#&Snop>e6kWsZ2c!4<6ZlTXT$G^-7+
z<vKrWxL#we!42G~bCb@^evai9om+Ko)45&8*15xvhsZje^^WsSjk|R2*4dzQkIub1
z_vviZxnHN<-~k@gdB~5!!#a;>JZjLvV-||lI-7KAoD@&!Jn1Kgr*xh+c!p<nHfubm
zv1Q9R*J<u8-QIr6@90|vOUko<@GY?)GLKUg_Fl8Zr6TqN<{&lJcIS-pO=7a*41056
zi2Y1Xj=eBvu)#Ky?d(ug^_UBNCv%Eony8~~BT(-<mD3bc(&~o5Y~SfjP|QrL#l4$T
z6RFbZH0ffe$u6E(1gm1PWFi?4FRhIv7sZ+qy?yKsvPYJ^L0U{+V4uc|CNHsH<7JaN
zx)nLC;furN%aSdN%WK0+H4d1(!a+r^L^2#tP7Ws{3QS(*HH8+5Hf1b^Z3fK(*SN6?
z-;!8Uq`FDrK4H`tlh=7e;b{sd!zORC$F2z04dgA8w|Pfl#3PN%;_*ndF=Fzr6S>5G
zBv`11+XsVH4Xq0rm!CRX8cCP5I2>&*pS7Sh(kPsH&*XhRkWN07${H7k6N&2R!kEcN
ze4Ig(e4nI|+Y)i1+ovX<@wq}zv@}Ph7-?dL99^kBp-;a3d*A%rqcG}{@s?<_J)+;&
z9=_m9dqTlbyFH|N4I$)LTPE~xbGgTJ$UZ!v*v>1c$>nR4Z}`rn%{kLWwAiZ)#^mvX
zoJ375*0yY^!mN%)Bk@U2nURFz^%7eZ_O}leZ1wV^qR8G?m}l=OEIV<$+!2JfE@bo~
zxsaKsR~dGCl_|^W5oQX7<UhskQ#5tbRI&BNEB`^_8%&TP43tY#!ceA()s#pW%XF$`
zmDV{!a!&#G8?vjnn2y*Ri)K_>$92))&76>C4YUSj<Y8O!hO{p7TvX~I-5T7*5SLIV
zzp_^+eJYKRVGXqk?EK;(sY0u$XTM<;mu1D{t&*%<>gi-yRxA5Q6Bxe(GhAT&)`&_o
zWcqe9vff=*SMLdV>*~ED>N+X!BB<EODCorM;uxorV=Hr<N&=}+z#1L$hrH<udq4u#
z3I8_vx;Rm>fjo&H<3u|x3w|IJ=whskIUOtyWr95ISRr3e#%{tL%<J)Z+nJvA9KhGX
z<WyGgPVe%h>qz@b#g$RJ8FW-wZik>|pnUDPH_LQ9IMZBDk^GBfI>q=oo?Mw_DP@dg
zxNu~I#Ej%@%9$re(Z*<2$P=4dDI;D>1?xCTp0sg1C4}vi@clxkcZE=ggib#Tk$z#K
z%A-mZFiBO&OH|EtRmTj~K#hu0t5z^etzoXRIbS_UgW64_`j}RAm{^)lcV#HkLnk2*
zHPoU~4v(10Ea8?{eZ`q#bmLc_aF$3Oa@BiMbFK7Ls&>g^a}GX6s_o1cNuy0*&lO2$
zg=%AtWa-69wUD`DGo<X_s29mE#sA8AlEsu3x;bBLInu~JE+BOd0WOqdyFj*PN|`66
zWWXA-VDqzJ^Rr;{vS9PGU=31w2BIMgF<%hEf^agvKjo-;Yb?-c)M#@4DMyko^7kj!
zjND^{P-wsagN2g8MRU+_UJK_Ei(VlX=aQPktco;mIyvdtbeuy6U)neEsLO29Dy<_q
z<k`vOh#s9}-2Wvh`EL@L(&9AK626tykaUOno+E^~QuMx3+Eo&BHP^7JM|zx9e*wCS
BjpG0S

diff --git a/target/classes/com/engine/attendance/enums/CheckBoxEnum.class b/target/classes/com/engine/attendance/enums/CheckBoxEnum.class
new file mode 100644
index 0000000000000000000000000000000000000000..0e3ac16ab2c0524884d3ec058f80e77d052c0065
GIT binary patch
literal 1547
zcmb7ET~8BH5IvXfw%f9NtrhuF5mDMA6ckWtMWB>uXyBpJ1odSpOIc{QNxLQb=Bxj~
zUtnUQAVM@6p8Xxh#6Mx2*{)ciCa@3p?wxzi%$%9o{r>y&HvnUp_d~*H0Jm|+hi)In
z0?;td%LL!t<>j7&po04fCIfVeu_>;gUBLqdQ+#^p!?X`G0{-R2#G_<lAvq@yNo9+L
zsA1(y%ZTc>ZCGo%l{LsxDU_p$4I{fXTYQnEQ%t~jMDuJJF9o#JroOF5^SYIbrtOkx
z<p?Bi>-ma7;Qq`^YB`w}7<_h~AYO-G78nYJ&qb6H#WjlCk|HUKmBOk~dZMr9ITOd@
z(z?J@=yb;6^CYLGidj9M(Mu+~cKu71UZ61ExM`X8l)z-2D34DEK5YqS1SEUIB=P>V
znX`1eQX<C#b^O&Qdvk`pz?}((!lw}e3f*U_?NQ>{yqm8l#DSmI5V+s*v)5%R=3v)N
z%b6X!Sj=ykc63%R8}8%;(#1+CYs{P6kG9&e8s-sF(Zyrktzs4lfzVlJQbjN3RP-aM
z;u1PkbfQB*j8Of4zIprW)$1Pz@A&$LiXbl1%_z0$ueqHq&HpBtQx)jp*#A>P)1A#1
zEz)qjz)P!}M%Jd`AFpjyBCnUrv6`~F-$-q1-1@ZF@?6;CaAtaxzFQ3f7a&h}vIc;5
z%A9@+4J_H&Nj1>g#YLpE7k>2MGO@1EsgHJk0y_|&&~OOPdpZeRrPb@)$%OC4H5Wfd
zewh)_q{so}Lr9EoIEL>di&{nDx|;(PnNS?@IXsYQ*CK;G`|w7F_TY<jN_$W~9C^}6
z7yIy{35{q*8(Jt+P#zv;;-;gJ-&kYS#wsNYI6guYJ&Xvg95G5e=PXA)!gn&=pyRlj
zuIxIde^Onta+2IxhpgZhhTO;*Qozr|7f36b-=hVz#(k)}XmSkAlGdWNI)*m+D?vOv
kXiBe0J7`PqLU28*ooIG6dZ`XRiYQYht2&2C8&`ki4~*YaQ~&?~

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/attendance/enums/ClassSegmentTypeEnum.class b/target/classes/com/engine/attendance/enums/ClassSegmentTypeEnum.class
index 24f95e1cc1bb7f99abd1ff87114d6521ba24ee08..1136cef31363df79181dd3ce21280991605aca5d 100644
GIT binary patch
delta 1131
zcmZuvOHUJF6g^Yg&PN@f%t8f?FGQpWR46Y|1hFXcC{n0aQLGP8M0_KP+OUEUjX)!~
zAW;)sxR6H?YQP687ybxWw8Fx_V7&KhSxB7Bd}q$N?>n=Q^gY@C<IloZ01iBjhY?K{
zG{d8!OvNb+a&VdtFI&#=aaO=C&?0coLhL+Ctpa%h7X*CFE(+ueToSm<?23RxpiQ8i
z*;Ro8folRC%&rR*3Un3=++f-zP$Y0u;1;vn0%W)&aF^LVff9lH0^Q6WsOVAgaQOLX
zW`fJ(Y;3BobGA0rR@5s<sBqV`R=FBmYn>Gyrvl;hI4hf~UG=j&m0m;QAs(wt!z1)6
zu#Xt*ehrm)tl=1*XgGjU4F^%GK(Q;(!l8G|U&bS2^O4Cp_BgJ=j{Rh$M_c|p9O;`1
zPtUAQ3~9)ddL9QY&ab}w79M=_>%|8R`BKj(Ju>z_JTSecJEZPV;EyF*t5P5h1)NBx
zUegPuUdXyky)yYWJTRi6Na{tTuS|u)ef@Mt#$RhFmU=P!PmG597x)fMYA9hnvBTHx
z%kA`awdV$gjIaDTP>>6)JcZ{22x%UP)W1aPS0c41k=l_+<t0)%iIkrHBm-|!A}tfJ
zrh@iP+>Ce}MmbfhAhwH;FN;42Wgdnl#7z@baD+~?Gzto+#L-xQgA#LyMK{_$!L$S;
z`y2l8caow-y-*cvg1#Jiamg0M!9=LrvbKg`wq?&jwWS0S%@#iw)#={?Hd66T*nrJQ
zMhZCL4hmyywVaOMc)qB{6B==X>;}|O;ab$u$;EOBxm}a(Bh>YsZj*_loth}IhxewS
z{=d;;eRSHoXbu)|p&?pYNu?3^`Wg6bZYy4d(W~#Wn)Nh&cL>@n(xtM;s_Gf~Ua4eC
z#by<HmcCCa+1B_#vzn3awVH!ScYCdB5Saubh-~*Plo?7N{Zuws0?*Vf+mp}(D+Xz6
R<J62Hwv&@+Bu@j}e*pw2#vlLy

delta 773
zcmZvYS!+{K6otQgGu)l@qG@Xc4M^yeHda$(>QJXR)w#}f);je!=u_}j1T7c!#Rn1k
zA~;r4sZ&7k!QatF{0}1TeG^fF=izMDS$nOs_Ws&Fx481{*W4$d#AJdfyOWHv$D`n}
zH%S-!?AmY40lN+gJ;EVjEUD<QJslDHgrmYSL&t@ja6&j~Xk6$QP6?+Coe>6vv%)z;
z=Y_m*VUcjr;3ba<kIPfD4`yySH{G_?7NOvCg{#5O$Z(;=HJ=S!_gTrH&ngBToFNB)
zVRm}{<D>e+YW?|J>)7biLvJt<O=tS()uy5~y|4bb|9Ro|<L`H$`Q((pr+k0Nmz1CX
zFjc?x;*ZII^0jC>lGmDzO;@^b=q6EKX3n5hox`e5VO6KFsxqvq)SbGPHLMyJQp?e)
z6vs(0#2R%iDl&IF$=5hl+!~RWiX7JJ9XD<aQ9+5}rl6$8CP{Wg^Y4h&h?>CtE71OR
z`r<dbSl<kxyV0&<@HF0CG4l>xJ9O$NOK2laJ4-`dmPp8sghN=LjnR0sL85F@-et4;
zZ((aQRY9wzisj$nwFb)k6DY<A<F+1$ZU0qEt2*1FHnC7<d-LlrI)a@bc;ZdEsd!M9
dTxtgAmA*ChxB@S@BbiRo*p2Wz*r}|`uHWGWVmSZ+

diff --git a/target/classes/com/engine/attendance/enums/PeriodOfTime.class b/target/classes/com/engine/attendance/enums/PeriodOfTime.class
new file mode 100644
index 0000000000000000000000000000000000000000..dea22157771faeae0fee03b71abc54879746d675
GIT binary patch
literal 1615
zcmb7F+fEZv6kUf-r_(a19TDZC;=L_m1@E*X6+w`J8mmoEUxqT&k#-u}DTyE8i;3~k
zAMionuwF14jnDpveui=H(}`B8iOj<}bJp2wU)J8!e*N*`Gl0`r2t&cy2+rYr2!kP9
zh@b~!yrlRh&C5j%do+w|xD=t&1Vb4OeHt!nnB>zH4gDIXG)(j9Y6vqS%nGO()4Y;d
z6iAqbN;zq}MaQ+1mgm{-vgH<RLh9vO^15AhD$CiGn@-tI2`Dq!TQ>wkGZ}MQvIDF3
zLjl9QZ>?F$lI0eYIj`!tMY0X9S*5y7#)tD6^VU>OVCc?PVyTi}6Bv%gw?tGXE6Wsj
zyGa!-)XPhD^`^B{;!LE+?25p6Y;(r(tt4ldm4a2uTUCc$`~DTzDpMFW?YNFNE-=<6
z%IxOAn~`{)r1tJPRD3w+6kW@!SIP0QHvZa^)uQdqac8<?@y!+j8r|oc?a|VOlAmuN
z#({6Q5T<Ad(*Li^cuLx?IIbKauTm+kI$rX!RkPU>4MikZsaFg3w8Q;~wocax9w8n3
zdC&)ST*I6|?0-j7#}Sx1;+WSlfW12QVXuHVNzM57=*73^FZnK^V-I=>9$|R>>Gx;v
zbo5DNl#wTorC~oK+kOu;XD%?nsr;)j8umh|;!;U}>YZJ>Zx=i&`%G)+CQDYWmTFPi
z|72P_<;&I6%Ja=;<N1jZ`jmShup8<`FINT7PPNFLDxlww4pu_$BnGgfkF}+<iZBk~
zAh8e8iFbY?4TyK>_=3PXodgcks>(Z!?2q86Z-1KnG9zLriT4P8fx`A3f7l-*L~mLl
z=I222lNCq2ivWVO8;PNT4XBCXw+JPAmABAd{qkf`eL$2lFwlve^wtgbI!Ih%Vn|lV
zZ(L&&<0=&#mp+Cm`Uxay<%qm<&cVbRg#J#qS2}K{8}uCuoNP<h{wD8hL)I{YQ9tqn
zs(_#Qk5CqkaKMNdog2_!qe}wY6l1%wLjq9=7(rvF(Jg^p>L=m^8tBR`Dh)()i@^qV
h<z7RuOw9&0WeSr#5o%;7PC+A)n-ZL&KM-!rnV$m%Ux@$!

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/common/cmd/GetDateCmd.class b/target/classes/com/engine/common/cmd/GetDateCmd.class
new file mode 100644
index 0000000000000000000000000000000000000000..6c6bcff7cf35158b638e186e90f428a8dab9d278
GIT binary patch
literal 2096
zcmbtVTXz#x7~Ln=Hk~##&}s@osDf!47{DUfw1v`2QPcX6in@I0nk0vG>SQLFOlaU&
z=~`ZjYw7ZtALVkNnJJkR(TXo~&iT$h-(`Q7dGY73zXMppP6kuBHjYW?W0;@7b==6{
zCO#a)QX021_z1T%xPy<!u&gdC86sEGSWRP1AhlxJrpHaLSUoVF7<%6`Eq&YQR2Ciy
zBsQF;6v$RhTkiDRb?NRJb&HZ*)oB>kBf~Y-ITR+meX}PpUu`&TUD_=^(z$Irw%%wr
z^)2ab8lK!}H!HN;F<hffboPW<f!R^rPdmr@Z;e7%f}>^FExqQsrroMUBwy4IWW%eh
z(bjm)Y}tm_cj@?@6JefGi6UdNCB3TC+Hh=74m^QUap7+wm9}SkPxbrevmur~q~$<1
z`W`)4Esnl&rEXHA+mId4arF%nX4uWpN@Za*W@?&JlnxOB<^Q5jAZ9mJ{`_P|xf6)@
zx|YCL)9{R{*<*y$5#vgtxO8Q&Z+R>bfvpqQA(zJ$bV_Pfh8q8elT+Fexc4Sje2T(i
z5@?Qc?bmkQe5SA0d!B1FJe57i4s-bCd}L})p9S&2RK1oRHqJGbH4RzZ)i8^<)3~Q$
z9rx4N(6EV5Sl&HpvFr<Wv+Q=uw#ARzwFc!uxA53?+J*k(y@Q6e_g#0-wFZO2;l6Yw
z!K-(f>|sR&;imCG!xkQ<@u`N-@HxkUDh&-)Y-_lHivk7K;y-q}z~ZZr*Am7OEc%@`
zGKnZ<=LuX1TQ{1Kusxz8fis8Fcp_cBC2i>%mi{G2n!tqJx2&7Np!j!X;Xo0%@T&iQ
zfp6A#9mnDT)975SYwbEg&)klB8EW}9(rsZWMf*BzE#Fehaaz`JY&w=or<%vKl(FUE
zL!-CvH{T4W&yc22%vOqb`sC_(%teWLtrJlYF7fX$#s3PB0BaA^h~X`szUCU^nkoGP
zQCj>7u^)JfBggL)R}h;ZdYtGpJk17ZoW%@Je5VSQ8sFhw;~Gfv+|6+x!#VEG<6VB0
zwK7+QiHYz1TV*BXOJ;oSfreP9oms*~>QFELK$1xQ7fU}PmWw|}B8DR*w{xkTtBK!`
z{w7|o9bs%aafI>ZWImb8<P*;^5yw~gq_P!6H0SG>V@&55;dvD3*=1U}K|3nCwZO*9
z=$44MME|lx&Eq}#lH>Y5cX8gFrSuBfxy<_y$U@R*K`|8E6<^-vc^B}pFuhKDCF)dB
fT_;wtpDHc>4DBQ*lMzl*p--_;&my^0{9gSFy`~|Z

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/common/util/DateUtil.class b/target/classes/com/engine/common/util/DateUtil.class
index 3aee837703bc6b1ff956da42c3828021dbec4edb..1f105b2d1f872e45e26b8aa76722b920a9c17b29 100644
GIT binary patch
literal 4997
zcmb_gX;U266+I2J_Vj=N0a}qz6dAF2<V22Tz)B=Q0mJ~-fE2R2fd)pN1rI%zl*LOD
zJBb~~S?$Ex?bumtIWn#yR6gVf<Ts^KIrsJJnU-iIK7^`y{nm5OUEb-I{{7#7{tLia
zd~D(b>?FFeXkrP=(l{nouqtzF(#uP8U7Dw*DVSU+%4$i5Wog!B_>74PHcYsv%G|Ri
zZs4Xgw`BNr6W_o$rTLcFcrJ<O@q)?bMHAn~cVzh81YSzu<pjQ$!1v?$K^(6bNZjII
zHoLrR;N;YG`&m2V=8H~drCcf6Zf4YWojHy#siEssh72_MC&tH%#f=RER&c^V%p0;Z
zoG<0w^9CAwPG2<;87VJ22AZexC1<)?Ty!dP_F{oEtyASCyKvR6<YlZUBko$B*xgf0
z<zmJut@2QY-D0_vsk-@sVm8kX38fYt(si=slDlT$RFCII!7i<4a&9GGS{*vQbBcV#
zQL(PP4sJJ)E(j&xdjkgpp;2u8C7Mqb><w2NPkK~F?OO&O3L!EX%A|2w_8XJT#)TCI
zSshPnukxj;>o5}WqTjRBrmR0ql*%`>`KDFJ9jR6-PRSL52KM)a8Vu}{?9#5pV(!*D
zyGbwgq+y`_ZoJt-bwhD$@0ke2H6{#n+<iu9dWYg%@T?7lL`LHYkIcOhjult{lG}97
zwU?gG+UvSVnhAN)aj!W}X}nymFiP!V&<t#H!?i2gd}6s;vE6*R#P|gAI;v-x(g5y)
zWABPfZ*}!3+Otk2UtZ?%u*~nQveP^scS_4%Oe7`R6^59ec#OR?wg+g|f<r@c+}n|2
z32pHF4Ti!%OC79MCYM7Zvy)W7(5@07#P{f;l=SdYLF<5-W0IDfOL@8VX(28*_+hz!
z7J6{n!Y6Ptj#n-G5U*MI5nhku#}<BqpIUebCoTL8KezA;8NMOSo6?M9!on$8{iO_l
zh1V^7QefV)@N4`gj^A3C#P0<2_i_Be!XNRrg?I2L3-98+IQ}d%f3fgaZ_nT2c;CVY
zxGmEk#_@Lxckq#gP24tMinI-6vjZZRZS}$N@$tc8aZto?-@UWUlAbbf>;YoN<8?8b
zS-kEnxwKPP<y!6yMAuoD3}Y^s){!;4l5?J^I;ACNXiupOY^s5?uq@l<Rjar&E9$-<
z_GKjWdUl2o^olwqnzf<CiJ>{t<I7(tOw21d1Lw3$YS->nxU+bfpmj==Z!f8=d$%be
z3tl&+_W0`ANcA*uqVB?O26-dPE3>vsVdM?-IR;-FK?&Opg|Q8!*n2&x7bNf0wf}!A
zB@Hy$T6fP^IhN(3FBh}HfV)m{y<D*inK|7F7Shhepwm9KD3e>(ip-ZkRUqY-YxQNI
zGrXQ^!BLs_<kZ0VAiEk!kX3y$$fhR8396x%@yxCv4xX&z88})GUCsHCwMw~Ep6AC6
zzamC2EaZ5z0~aY|A3b{_=tgbJ+}?uB2sSAqs@}4;ybMjZJW+DTZrUOe5#B9%pJXSd
z=jX<9{9NqjhbIt0Qbd)#q^P2LQY_VzlFDZ%4AEY;y&PruH2946{sYEG>@=W{ZA?v?
z=x5*ZHedh`bCl$fGn|pbGic;~LiTQ=VH=HGh)ngFTZnEVwuSf|E_raK+SY;;S`}o6
zcMOl<Q{0oHiBI#}nKurPJ`g++4&F|f&If>h29Igx3uGR-oB8y>u`ML&NC@*I1V5_4
zkMp3!&|@yWb9kJfz7LJ`Veo-w%y2Wu33Fo4W`=5Ja@w1g-fg6OKdcZxP9e${t0dL)
zqow9Y3x<^+QJo9%<B9tiNN*y{KpzeC@7cilTCy**Af%Gof|V4W=rat`Bg%wVMQybz
zO4O?8v-q4&^a%wEnA>Qo2i*u1`J?po!Y=!pbqs_1&#C?X6&TaR(+vH-DH`bu3HuPE
zG8~|s#zj^5Q6w<JODTmviZM<3ab{DlWHZqYy|jfL#o}Gg3kuM?oXxDlOFWXq=XZtK
zQQ98NSSSoXvNW3ywS!lBx6m?t_<dU8=amQz5a&;Hz~oOZ@;?49^4G@SATt@;M(Z6f
zqv}bI)YFouA@b0u649lQCK;v6tcWa~nPEbn<fmQ^vzQM=?ut%!l)EPBvcVH#Kl&e>
zG2;AV2&TB^=~J+(#5M!EjkYPKX#Z^<3u@C-Xo4Lu)P`y0QWHtdkc6b@NnFvu(>f>}
zx?Bmoh4yW92zKWO_h9GIg6je74vpQSuyY!FPGgHSDUH$CeV(=wJlh`vzClT?DsW$#
zJmMlv^K^k91KLajUAS6vp+qB55<SGiJs^ck2eO+u*heFWE_QF@aNUhomF?%a|9Q&8
zi)iQnFo=lss`*3Oohaw8;S02AF_;VNHE<@1FH%@UPOidt@g~PH-*&c-1g2@Ze}I-B
zi*!UnY`;RBSDEM6u%G`-5Zh-x_S!c6(BAqi8n}C(V$sMmF~ve&j$gu;b)a7+3#s6)
z-hS4`bf2_?kxd*KI2aKo(T->clQ)R<Cer+O#{s;hn4DL>bk&%2X(mKgx4VJs2N;>N
zw3lWnEU*{hjK?XeIE6(fC6P%nGDq$gnYS5-cj)W8^zywuMCL5B;zdUI1S2zruY{DK
z+#8mlcYWHV1b5t>J1ntHW%~XlI7`zBe6{xNA%Z7=-K|F{o*$#3wM#vlTaT%y)p}e#
cWAa_%Nw8OmDZ*IHZkkbS;>y>!-hik62S%PFdH?_b

literal 4865
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
aI`G8LtAQk8EXFlO{%Jn>3ZFOOtN#Tb(G?N^

diff --git a/target/classes/com/engine/common/util/Utils$1.class b/target/classes/com/engine/common/util/Utils$1.class
index 42fa089c6763dadc8402c3f4ca48955307cf3f6e..577d9aaadfa66712598aa9dc5110176d016d2370 100644
GIT binary patch
delta 13
UcmbQvGM#0^4Ms-E$u}A803jX(g#Z8m

delta 13
UcmbQvGM#0^4Ms+Z$u}A803jI!ga7~l

diff --git a/target/classes/com/engine/common/util/Utils$2.class b/target/classes/com/engine/common/util/Utils$2.class
index 66351bb9a3e97410d736223c5265bfea471eb1c6..c9693157060d10139766c4f48f0dbe5f4fccf5bd 100644
GIT binary patch
delta 13
UcmZo=X=T}PjFC}l@^MBx03NLbJ^%m!

delta 13
UcmZo=X=T}PjFC}t@^MBx03N6WJpcdz

diff --git a/target/classes/com/engine/common/util/Utils$3.class b/target/classes/com/engine/common/util/Utils$3.class
index 6d6b504d322f5003333ee4044ad4a69fda30f4d9..bfca27ba7f03fe6427a5822419683385e1574481 100644
GIT binary patch
delta 19
bcmeBS?_uBYjEQmk<mXJ`jJqe>Gy4JnO790K

delta 19
bcmeBS?_uBYjEQmE<mXJ`jJqb=Gy4JnO5X=2

diff --git a/target/classes/com/engine/common/util/Utils.class b/target/classes/com/engine/common/util/Utils.class
index 94d7fa3fa50fdaea0b40136a3f849059bdebf971..c931730654b5630a7f3bfa0dccb78f057f56eb45 100644
GIT binary patch
delta 4190
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

delta 2704
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

diff --git a/target/test-classes/Test.class b/target/test-classes/Test.class
index 8c09ec5a6088f472275647d0424a77888baf5f91..38133fb9b60fdeb6653cb18cbf979424a68e6d97 100644
GIT binary patch
delta 637
zcmZ9I+int36o$WHfPv|#Eu~azPo9AmXBf~bR;y4CRa#A~4=^DkLSRM-8gH~V`T`BF
z;f*yx>V@8U;mi02#>LP?<Gxty-~U?c+bjFW*mu41^Y_<pK#@l}M>rSfJQrf5buwgQ
zEa@zh)47PLW08+zQ_v+8buMvPV@2c2UfJI}nCrbz4xS$6n8sCu64w;QZObm?@>Z^3
zE!u^WWofJ$T<6ArCA(zhHP#Gna!aFZP+?u;w!t0lYTPr};J(2Fsv4UHTRiMFL$keK
zq5RrH&2O8oS8sT(DYET*=F4uQWv)A2_lXDvt?qWW8*Nu1m##LQSB}|oyt?_g+i7_9
z-di;l8&+l6>E5n7xjJf%3+uVlakqVi%;8v9+RWOsj_>(qB}i4j=Cp<{1%%AT=Xupu
zb`1H&;ZaeL-;g*iH&e1AIg<T?@<~L935n6boFF0E7&S0SQf_gkNQpBXE(b73?h{I=
z1Hy@jgg((e+FzC~OxS4(;LSh4B-0!ZfG3za1iltvRJ@t&fY|1egspwz%eg-KN;nlB
zF!oWZqZJc`MZY7$E;{dJxeo!oD2@;~$*km|niHj@#hzlG1sT_6`$bWz3`IG`X+bHR
Jk>(I*{{VB@WCZ{K

delta 825
zcmZ8eOHUJF6g}VcF?Koyic+*xi|_JsP^+lrRf-~79#V8a)Ug>HI;0&C+;rm~s4V>f
zZd@oPST)g|3lsl?TQ?@gor&U^sWIqGa^Lsdd+zsM`4FD?`0LF(0BPJ-prT*F0M3M=
zVK9WVIOl`-{9VC$q!nDi#Sn&YNuju`;0iJ_hGmS@b9PXe0%E%UJXvd9GVa+G!!q=B
zV^VhvfwugzzOHL)j%jImv+867VtKo$TX*z|sV`Z^;^wNc=o$i3|J4rf@n`haKdz;h
zOIpFHnB`KYS>Q$HmX?ip(aDVR7l;%by?CEZ9<+?n`lq+!5wyq{Q!$P#BPu44lQF5{
zDz3?xQgI#AGH$52iM)&%6|<OAF^^j^7E~0lxb;;eYAyfr5l9y86|H33CCkuguGnQN
z%QA|NN4P4WmW>D5N=4sv4<OK)>e)l=Z-QI<tL8)A!I$cp=H<LWO}3j=$5>&)Ufb%H
zx?X;f21PB*7jr+p63C3Qm7Yc|r~|#PAYRar&_)^bf>A_itIYzmV?VtR4xob(xA`%v
zebn6zNcq0k@NuQPBZ()7Zo}Um*g^1-wEJ}Tn~PiXd%!US=w#vNHKWMk5OorHZ%{YE
zA{-M#CxHozgUo}q3B=LGp$U5KI?c#oT1UKy^b-*oN%4a?A@&_*#$9lOh(YRjZ({@U
zOkV@?>^AoG59}Z`<d69qP@XZ}<lIhJV2%sUL%{-h7QD66-pX+t!*S*bh7+^|qa8Sj
YQ|wkq?KCYPdxA)zhe!gwtd-FB8{)K?qW}N^

diff --git a/test/Test.java b/test/Test.java
index c519210..73ad339 100644
--- a/test/Test.java
+++ b/test/Test.java
@@ -62,17 +62,66 @@ public class Test {
        // System.out.println("aaaa");
 
         //System.out.println(Util.getIntValue(""));
-        List<Map<String,Object>> beforeleaveDate = Lists.newArrayList();
-        for (int i=beforeleaveDate.size()-1;i>=0;i--){
-            System.out.println(123123);
-        }
-//        System.out.println(DateUtil.getTime("2023-10-30 23:00").compareTo(DateUtil.getTime("2023-10-30 22:01")));
+//        List<Map<String,Object>> beforeleaveDate = Lists.newArrayList();
+//        for (int i=beforeleaveDate.size()-1;i>=0;i--){
+//            System.out.println(123123);
+//        }
+//        System.out.println("".split("-")[0]);
+//        for (int i=0;i<5;i++){
+//            int j=i+1;
+//            if (j > 5-1){
+//                j = 5-1;
+//            }
+//            System.out.println(j);
+//        }
+//        Map<String,Object> jsdkNearestClcokInTime = Maps.newHashMap();
+//        jsdkNearestClcokInTime.put("after","222");
+//        //jsdkNearestClcokInTime.put("before","222");
+//        jsdkNearestClcokInTime.put("equal","222");
+//        if (jsdkNearestClcokInTime.get("equal") != null){
+//            System.out.println(111);
+//        }else if (jsdkNearestClcokInTime.get("after") != null){
+//            System.out.println(222);
+//        }else if (jsdkNearestClcokInTime.get("before") != null){
+//            System.out.println(333);
+//        }
+//        List<Map> lists = Lists.newArrayList();
+//        List<Map> lists2 = Lists.newArrayList();
+//        List<Map> lists3 = Lists.newArrayList();
+//        lists.add(new HashMap());
+//        lists.add(new HashMap());
+//        lists.add(new HashMap());
+//        lists2.add(lists.get(1));
+//        lists3.add(lists.get(1));
+//        if (lists2.get(0) == lists3.get(0)){
+//            System.out.println(1111);
+//        }
+//        System.out.println("aa|aa|ss".split("\\|")[2]);
+
+
+       // long numDays = DateUtil.getBetWeenMinutes("2023-11-08 15:40","2023-11-08 16:30");
+//        System.out.println(numDays/2);
+      //  System.out.println(DateUtil.AfterMinutes("2023-11-08 15:40:05",numDays/2));
+
+        System.out.println(DateUtil.getTime("2023-10-30 23:00").compareTo(DateUtil.getTime("2023-10-30 22:01")));
         //System.out.println(DateUtil.beforeDay("2023-10-31",1));
 //        List<Map<String,Object>> personGroupOrganizationList = Lists.newArrayList();
 //        personGroupOrganizationList.add(new HashMap(){{put("dx","4-夜班人员");}});
 //        personGroupOrganizationList.add(new HashMap(){{put("dx","8-测试条件录入");}});
 //        Set<String> personGroupIds = personGroupOrganizationList.stream().map(e -> Util.null2String(e.get("dx")).split("-")[0]).collect(Collectors.toSet());
 //        System.out.println(String.join(",",personGroupIds));
+//        List<String> list = Lists.newArrayList();
+//        list.add("1");
+//        list.add("2");
+//        list.add("5");
+//        System.out.println(list);
+//        list.add(1,"10");
+     //  Map<String,Object> map = new HashMap(){{
+           //put("11","22");
+//           put("33","44");
+//           put("44","66");
+//       }};
+//       System.out.println(map);
     }
 
     public static int getDaysBetween(String date1, String date2) {