From 481c1d2ceb5539c9fbea70419067879b1679e933 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Fri, 29 Dec 2023 10:01:09 +0800
Subject: [PATCH] liuliang

---
 .../commonutil/PersongroupCommonUtil.java     |   2 +
 .../service/impl/PersonGroupServiceImpl.java  |  10 +
 .../enums/ApplicableOrganizationEnum.java     |  33 +++
 .../HolidayGenerationJob.java                 |   1 +
 .../vacation/service/vocationService.java     |   9 +
 .../cmd/GetPersonDateBySuitOrganzation.java   | 259 ++++++++++++++++++
 .../cmd/ComputeAttendanceDurationCmd.class    | Bin 10106 -> 10109 bytes
 .../cmd/GetClockInPointCmd.class              | Bin 24051 -> 24056 bytes
 .../cmd/GetClockInTimeItemCmd.class           | Bin 14706 -> 14706 bytes
 .../cmd/item/AbsenteeismItemCmd.class         | Bin 4202 -> 4202 bytes
 .../cmd/item/BeAwayItemCmd.class              | Bin 3821 -> 3821 bytes
 .../cmd/item/BeLateItemCmd.class              | Bin 4122 -> 4122 bytes
 .../cmd/item/LeaveEarlyItemCmd.class          | Bin 4141 -> 4141 bytes
 .../cmd/item/VacationItemCmd.class            | Bin 3826 -> 3826 bytes
 .../cmd/item/WorkOvertimeItemCmd.class        | Bin 3985 -> 3985 bytes
 .../job/AttendanceAnalysisJob.class           | Bin 4586 -> 4586 bytes
 .../service/impl/AskForLeaveServiceImpl.class | Bin 7038 -> 7041 bytes
 .../service/impl/EvectionServiceImpl.class    | Bin 7045 -> 7045 bytes
 .../service/impl/UtilServiceImpl.class        | Bin 15359 -> 15366 bytes
 .../impl/WorkOverTimeServiceImpl.class        | Bin 22407 -> 22417 bytes
 .../web/AttendanceanalysisAction.class        | Bin 11716 -> 12701 bytes
 .../wrapper/AttendanceAnalysisWrapper.class   | Bin 16298 -> 16301 bytes
 .../UpdateAttendanceResultWrapper.class       | Bin 16014 -> 16016 bytes
 .../README.md                                 |   0
 .../GetAttendanceItemsByPersonDataCmd.class   | Bin 8485 -> 8485 bytes
 .../service/AttendancePlanService.class       | Bin
 .../impl/AttendancePlanServiceImpl.class      | Bin
 .../web/AttendancePlanAction.class            | Bin
 .../commonutil/PersongroupCommonUtil.class    | Bin 14415 -> 14412 bytes
 .../job/scheduling/SchedulingJob.class        | Bin 4033 -> 4034 bytes
 .../tactics/DayRegularScheduling.class        | Bin 7505 -> 7505 bytes
 .../tactics/MonthRegularScheduling.class      | Bin 7560 -> 7560 bytes
 .../tactics/WeekRegularScheduling.class       | Bin 7945 -> 7945 bytes
 .../tactics/YearRegularScheduling.class       | Bin 7984 -> 7984 bytes
 .../service/impl/PersonGroupServiceImpl.class | Bin 8172 -> 8650 bytes
 .../enums/ApplicableOrganizationEnum.class    | Bin 0 -> 1816 bytes
 .../cmd/GetPersonDateBySuitOrganzation.class  | Bin 0 -> 9616 bytes
 .../com/engine/common/util/CommonUtil.class   | Bin 8861 -> 8861 bytes
 .../com/engine/common/util/DbTools.class      | Bin 4229 -> 4229 bytes
 .../com/engine/common/util/Utils.class        | Bin 20092 -> 20096 bytes
 .../modeexpand/DeleteCheckCalendar.class      | Bin 0 -> 1860 bytes
 target/test-classes/Test2.class               | Bin 3129 -> 3129 bytes
 target/test-classes/TestGetClockInPoint.class | Bin 14063 -> 14063 bytes
 ...stMergeAskForLeaveAndEvctionSchedule.class | Bin 4309 -> 4309 bytes
 target/test-classes/TestObj.class             | Bin 430 -> 603 bytes
 test/TestObj.java                             |   3 +-
 46 files changed, 315 insertions(+), 2 deletions(-)
 create mode 100644 src/com/engine/attendance/enums/ApplicableOrganizationEnum.java
 create mode 100644 src/com/engine/attendance/vacation/service/vocationService.java
 create mode 100644 src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java
 rename target/classes/com/engine/attendance/{attendancePlan => attendanceplan}/README.md (100%)
 rename target/classes/com/engine/attendance/{attendancePlan => attendanceplan}/cmd/GetAttendanceItemsByPersonDataCmd.class (98%)
 rename target/classes/com/engine/attendance/{attendancePlan => attendanceplan}/service/AttendancePlanService.class (100%)
 rename target/classes/com/engine/attendance/{attendancePlan => attendanceplan}/service/impl/AttendancePlanServiceImpl.class (100%)
 rename target/classes/com/engine/attendance/{attendancePlan => attendanceplan}/web/AttendancePlanAction.class (100%)
 create mode 100644 target/classes/com/engine/attendance/enums/ApplicableOrganizationEnum.class
 create mode 100644 target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class
 create mode 100644 target/classes/weaver/formmode/customjavacode/modeexpand/DeleteCheckCalendar.class

diff --git a/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java b/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java
index 0e74d38..0033e92 100644
--- a/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java
+++ b/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java
@@ -330,4 +330,6 @@ public class PersongroupCommonUtil {
         String sql = "select id,mc name from uf_jcl_kq_hxbz";
         return DbTools.getSqlToMapList(sql);
     }
+
+
 }
diff --git a/src/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.java b/src/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.java
index 4aa26bd..a1881c8 100644
--- a/src/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.java
+++ b/src/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.java
@@ -44,6 +44,12 @@ public class PersonGroupServiceImpl extends Service implements PersonGroupServic
         sql = "select fieldid,selectvalue,selectname from hrm_selectitem";
         List<Map<String,Object>> selectItemLists = DbTools.getSqlToList(sql);
         Map<String, List<Map<String,Object>>> selectItemMap = selectItemLists.stream().collect(Collectors.groupingBy(e -> e.get("fieldid").toString()));
+
+        sql = "select fieldid,selectvalue,selectname from cus_selectitem";
+        List<Map<String,Object>> custSelectItemLists = DbTools.getSqlToList(sql);
+        Map<String, List<Map<String,Object>>> custSelectItemMap = custSelectItemLists.stream().collect(Collectors.groupingBy(e -> e.get("fieldid").toString()));
+
+
         log.info("selectItemMap : [{}]",selectItemMap);
 
         sql = "select type,linkurl from wf_browser_config group by type";
@@ -53,10 +59,14 @@ public class PersonGroupServiceImpl extends Service implements PersonGroupServic
 
         for (Map<String,Object> map :dataList){
             Integer fieldlable = Integer.valueOf(map.get("fieldlable").toString());
+            String fieldname = Util.null2String(map.get("fieldname"));
             String showName = SystemEnv.getHtmlLabelName(fieldlable, user.getLanguage());
             map.put("showName",showName);
             map.put("linkurl",browserTypeMaps.get(map.get("type").toString()));
             map.put("selectItems",selectItemMap.get(map.get("fieldid").toString()));
+            if (fieldname.contains("field")){
+                map.put("selectItems",custSelectItemMap.get(map.get("fieldid").toString()));
+            }
         }
 
         data.put("data",dataList);
diff --git a/src/com/engine/attendance/enums/ApplicableOrganizationEnum.java b/src/com/engine/attendance/enums/ApplicableOrganizationEnum.java
new file mode 100644
index 0000000..7508fe0
--- /dev/null
+++ b/src/com/engine/attendance/enums/ApplicableOrganizationEnum.java
@@ -0,0 +1,33 @@
+package com.engine.attendance.enums;
+
+import com.finance.toolkit.BaseEnum;
+
+/**
+ * 适用组织-对象类型
+ */
+public enum ApplicableOrganizationEnum implements BaseEnum {
+
+    PERSONNEL("0","人员"),
+    PERSONNEL_GROUP("1","人员分组"),
+    DEPARTMENT("2","部门"),
+    SUBCOMPANY("3","分部");
+
+    private String key;
+    private String value;
+
+    ApplicableOrganizationEnum(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/vacation/job/holidaygeneration/HolidayGenerationJob.java b/src/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.java
index 7d1a243..31a09be 100644
--- a/src/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.java
+++ b/src/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.java
@@ -21,5 +21,6 @@ public class HolidayGenerationJob extends BaseCronJob {
         Map<String,String> formmodeIdMap = Utils.getFormmodeIdMap();
         //假期额度模块id
         String modeId = formmodeIdMap.get("uf_jcl_kq_jqed");
+
     }
 }
diff --git a/src/com/engine/attendance/vacation/service/vocationService.java b/src/com/engine/attendance/vacation/service/vocationService.java
new file mode 100644
index 0000000..a0452f7
--- /dev/null
+++ b/src/com/engine/attendance/vacation/service/vocationService.java
@@ -0,0 +1,9 @@
+package com.engine.attendance.vacation.service;
+
+import weaver.hrm.User;
+
+import java.util.Map;
+
+public interface vocationService {
+    Map<String,Object> getHrmCondition(Map<String,Object> params, User user);
+}
diff --git a/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java b/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java
new file mode 100644
index 0000000..f6fd37d
--- /dev/null
+++ b/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java
@@ -0,0 +1,259 @@
+package com.engine.common.cmd;
+
+import com.engine.attendance.enums.ApplicableOrganizationEnum;
+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.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import lombok.extern.slf4j.Slf4j;
+import weaver.general.Util;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 获得modeid下所有适用组织人
+ */
+@Slf4j
+public class GetPersonDateBySuitOrganzation extends AbstractCommonCommand<Map<String,Object>> {
+    @Override
+    public BizLogContext getLogContext() {
+        return null;
+    }
+
+
+    public GetPersonDateBySuitOrganzation(Map<String,Object> params){
+        this.params=params;
+    }
+
+    @Override
+    public Map<String, Object> execute(CommandContext commandContext) {
+        String modeId = Util.null2String(params.get("modeId"));
+        String sql = "select dxlx,aqjb,dataid,dx from uf_syzz where modeid=?";
+        //假期额度适用组织所有值集合
+        List<Map<String,Object>> organzationList = DbTools.getSqlToList(sql,modeId);
+        sql = "select a.id dataid,a.*,b.* from uf_jcl_kq_jqed a left join uf_jcl_kq_jqed_dt1 b on a.id=b.mainid";
+        //所有假期额度生成规则值
+        List<Map<String,Object>> vacationList = DbTools.getSqlToList(sql);
+        //人力资源id，（假别，规则id）
+        Map<String,Object> personMap = Maps.newHashMap();
+        //人员分组id，（假别，规则id）
+        Map<String,Object> personOrganzationMap = Maps.newHashMap();
+        //部门id，（假别，规则id）
+        Map<String,Object> departMentMap = Maps.newHashMap();
+        //分部id，（假别，规则id）
+        Map<String,Object> subCompanyMap = Maps.newHashMap();
+
+        //以假期额度生成规则id分割的适用组织所有值集合
+        Map<String,List<Map<String,Object>>> organzationCollect = organzationList.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("dataid"))));
+        //规则id-对象id，安全级别
+        Map<String,String> organzationByMap = Maps.newHashMap();
+        for (Map<String,Object> map : organzationList){
+            String dataid = Util.null2String(map.get("dataid"));
+            String aqjb = Util.null2String(map.get("aqjb"));
+            String dx = Util.null2String(map.get("dx")).split("-")[0];
+            String key = dataid+"-"+dx;
+            String oldvalue = organzationByMap.get(key);
+            if (oldvalue == null){
+                organzationByMap.put(key,aqjb);
+            }else {
+                oldvalue = oldvalue+","+aqjb;
+                organzationByMap.put(key,oldvalue);
+            }
+
+        }
+
+
+        //以假期额度生成规则id分割的假期额度生成规则值集合
+        Map<String,String> vacationMap = vacationList.stream().collect(Collectors.toMap(e->e.get("dataid").toString(),e->e.get("jb").toString()));
+
+        Set<String> personOrganzationIds = Sets.newHashSet();
+        Set<String> departMentIds = Sets.newHashSet();
+        Set<String> subCompanyIds = Sets.newHashSet();
+        for (Map<String,Object> organzation:organzationList){
+            String dx = Util.null2String(organzation.get("dx")).split("-")[0];
+            String dataid = Util.null2String(organzation.get("dataid"));
+            String jb = vacationMap.get(dataid);
+            if (ApplicableOrganizationEnum.PERSONNEL.getKey().equals(organzation.get("dxlx"))){
+                Map<String,String> psersonSet = (Map<String,String>)personMap.get(dx);
+                if (psersonSet == null){
+                    psersonSet = Maps.newHashMap();
+                    personMap.put(dx,psersonSet);
+                }
+                psersonSet.put(jb,dataid);
+            }else if (ApplicableOrganizationEnum.PERSONNEL_GROUP.getKey().equals(organzation.get("dxlx"))){
+                personOrganzationIds.add(dx);
+
+                Map<String,String> personOrganzationSet = (Map<String,String>)personOrganzationMap.get(dx);
+                if (personOrganzationSet == null){
+                    personOrganzationSet = Maps.newHashMap();
+                    personOrganzationMap.put(dx,personOrganzationSet);
+                }
+                personOrganzationSet.put(jb,dataid);
+            }else if (ApplicableOrganizationEnum.DEPARTMENT.getKey().equals(organzation.get("dxlx"))){
+                departMentIds.add(dx);
+
+                Map<String,String> departMentSet = (Map<String,String>)departMentMap.get(dx);
+                if (departMentSet == null){
+                    departMentSet = Maps.newHashMap();
+                    departMentMap.put(dx,departMentSet);
+                }
+                departMentSet.put(jb,dataid);
+            }else if (ApplicableOrganizationEnum.SUBCOMPANY.getKey().equals(organzation.get("dxlx"))){
+                subCompanyIds.add(dx);
+
+                Map<String,String> subCompanySet = (Map<String,String>)subCompanyMap.get(dx);
+                if (subCompanySet == null){
+                    subCompanySet = Maps.newHashMap();
+                    subCompanyMap.put(dx,subCompanySet);
+                }
+                subCompanySet.put(jb,dataid);
+            }
+        }
+        sql = "select id,departmentid,subcompanyid1,seclevel from hrmresource where 1=1";
+        if (departMentIds.size() > 0){
+            sql = sql+ " and departmentid in ("+String.join(",",departMentIds)+")";
+        }
+        if (subCompanyIds .size() >0 && departMentIds.size() > 0){
+            sql = sql+ " or subcompanyid1 in ("+String.join(",",subCompanyIds)+")";
+        }else if (subCompanyIds .size() >0 && departMentIds.size() == 0){
+            sql = sql+ " and subcompanyid1 in ("+String.join(",",subCompanyIds)+")";
+        }
+
+
+        List<Map<String,Object>> hrmListByDepartAndSubCompanyIds = DbTools.getSqlToList(sql);
+        //分部id-人员id集合
+        Map<String,List<Map<String,Object>>> hrmListGroupByDepart = hrmListByDepartAndSubCompanyIds.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("departmentid"))));
+        //部门id-人员id集合
+        Map<String,List<Map<String,Object>>> hrmListGroupBySubCompany = hrmListByDepartAndSubCompanyIds.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("subcompanyid1"))));
+        //人员分组id-人员id集合
+        Map<String,Set<String>> personGroupUserIds = getPersonGroupUserIds(personOrganzationIds);
+
+        //人员分组id-（假别，假期规则id）
+        for (Map.Entry<String,Object> entry : personOrganzationMap.entrySet()){
+            String personGroupId = entry.getKey();
+            //人员分组（假别，假期规则id）
+            Map<String,String> personGroupHolidayMap = (Map<String,String>)entry.getValue();
+            Set<String> userIds = personGroupUserIds.get(personGroupId);
+            for (String userId :userIds){
+                //人力资源原本已有的假期，（假别，规则id）
+                Map<String,String> psersonSet = personMap.get(userId) == null?null:(Map<String,String>)personMap.get(userId);
+                if (psersonSet == null) {
+                    personMap.put(userId,personGroupHolidayMap);
+                }else {
+                    Map<String,String> newMap = Maps.newHashMap();
+                    for (Map.Entry<String,String> personGroupHolidayEntry :personGroupHolidayMap.entrySet()){
+                        if (psersonSet.get(personGroupHolidayEntry.getKey()) == null){
+                            newMap.put(personGroupHolidayEntry.getKey(),personGroupHolidayEntry.getValue());
+                        }
+                    }
+                    personMap.put(userId,newMap);
+                }
+            }
+        }
+        //部门id
+        for (Map.Entry<String,Object> entry : departMentMap.entrySet()){
+            String departMentId = entry.getKey();
+            //部门（假别，假期规则id）
+            Map<String,String> departMentHolidayMap = (Map<String,String>)entry.getValue();
+            List<Map<String,Object>> userIds = hrmListGroupByDepart.get(departMentId);
+            for (Map<String,Object> userIdMap :userIds){
+                //人力资源原本已有的假期，（假别，规则id）
+                String userId = Util.null2String(userIdMap.get("id"));
+                Map<String,String> psersonSet = personMap.get(userId) == null?null:(Map<String,String>)personMap.get(userId);
+                if (psersonSet == null) {
+                    personMap.put(userId,departMentHolidayMap);
+                }else {
+                    Map<String,String> newMap = Maps.newHashMap();
+                    for (Map.Entry<String,String> personGroupHolidayEntry :departMentHolidayMap.entrySet()){
+                        if (psersonSet.get(personGroupHolidayEntry.getKey()) == null){
+                            newMap.put(personGroupHolidayEntry.getKey(),personGroupHolidayEntry.getValue());
+                        }
+                    }
+                    personMap.put(userId,newMap);
+                }
+            }
+        }
+        //分部id
+        for (Map.Entry<String,Object> entry : subCompanyMap.entrySet()){
+            String subCompanyId = entry.getKey();
+            //分部（假别，假期规则id）
+            Map<String,String> subCompanyHolidayMap = (Map<String,String>)entry.getValue();
+            List<Map<String,Object>> userIds = hrmListGroupBySubCompany.get(subCompanyId);
+            for (Map<String,Object> userIdMap :userIds){
+                //人力资源原本已有的假期，（假别，规则id）
+                String userId = Util.null2String(userIdMap.get("id"));
+                Map<String,String> psersonSet = personMap.get(userId) == null?null:(Map<String,String>)personMap.get(userId);
+                if (psersonSet == null) {
+                    personMap.put(userId,subCompanyHolidayMap);
+                }else {
+                    Map<String,String> newMap = Maps.newHashMap();
+                    for (Map.Entry<String,String> personGroupHolidayEntry :subCompanyHolidayMap.entrySet()){
+                        if (psersonSet.get(personGroupHolidayEntry.getKey()) == null){
+                            newMap.put(personGroupHolidayEntry.getKey(),personGroupHolidayEntry.getValue());
+                        }
+                    }
+                    personMap.put(userId,newMap);
+                }
+            }
+        }
+        log.info("personMap : [{}]",personMap);
+        return personMap;
+    }
+
+    /**
+     * 获得人员分组下面的人员集合
+     * @param personOrganzationIds
+     * @return人员分组id-人员id集合
+     */
+    public Map<String,Set<String>> getPersonGroupUserIds(Set<String> personOrganzationIds){
+        String sql = "select b.mainid,b.empid,b.filters,b.bdate,b.edate,a.list_type from uf_ryqz a left join uf_ryqz_dt1 b on a.id=b.mainid where  mainid in ("+String.join(",",personOrganzationIds)+")";
+
+        List<Map<String,Object>> personGroupDataList = DbTools.getSqlToList(sql);
+
+        Map<String,Set<String>> personGroupUserIds = Maps.newHashMap();
+        for (Map<String,Object> personGroupData :personGroupDataList){
+            String id = Util.null2String(personGroupData.get("mainid"));
+            String empid = Util.null2String(personGroupData.get("empid"));
+            String filters = Util.null2String(personGroupData.get("filters"));
+            String list_type = Util.null2String(personGroupData.get("list_type"));
+
+            Set<String> userIds = personGroupUserIds.get(id);
+            if (userIds == null){
+                userIds = Sets.newHashSet();
+                personGroupUserIds.put(id,userIds);
+            }
+
+            if ("0".equals(list_type) && !"".equals(empid)){
+                //人员清单
+                userIds.add(empid);
+
+            }else if ("1".equals(list_type) && !"".equals(filters)){
+                //条件清单
+                sql = "select id,seclevel from hrmresource where 1=1 ";
+                if (filters.contains("field")){
+                    sql = "select a.id,a.seclevel from hrmresource a left join cus_fielddata b on a.id=b.id where scope='HrmCustomFieldByInfoType' and scopeid=-1 and "+filters;
+                }else {
+                    filters = filters.replace("ａｎｄ","and");
+                    filters = filters.replace("ｏｒ","or");
+                    sql = sql+ " and "+filters;
+                }
+                log.info("getPersonnelGroupingByPerson filter sql : {}",sql);
+                List<Map<String,Object>> dataList = DbTools.getSqlToList(sql);
+                for (Map<String,Object> dataMap :dataList){
+                    String hrmId = Util.null2String(dataMap.get("id"));
+                    String seclevel = Util.null2String(dataMap.get("seclevel"));
+                    userIds.add(hrmId);
+                }
+            }
+        }
+
+        return personGroupUserIds;
+    }
+}
diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.class
index 7c9b89dbffabb6ad4025d5ebde62f52f779dba80..504cf3e96cd1abb268ddb753b944434343a7432c 100644
GIT binary patch
delta 70
zcmez6_t$TOB&VcAPGW9SN}@_pYHog6s%u$la!F=>o{FLQWJ6AAM(N4EoRVUOW{eDi
UP<5#lsmY}!sVau1i>o;009Ec5P5=M^

delta 89
zcmezC_segCB&UgZPGW9SN}@_pYHog6s%u$la!F=>o{A+SgOG+#R$^JAerZW&j=pbV
nfwg87BLib9BZJgrKTb&z3q}S3sNU3y)a25VR2B2ZwVZMQHt!pI

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.class
index a0e934fd6635fdef10811ee1d8c77c9a4c30023a..45461f55e6d87c0873372ddc08bad7e0cfabe4c6 100644
GIT binary patch
delta 146
zcmeyooAJkP#tlJyQj$4|xk)LBD(R^u&N=zX*`9d;`I&hoDn>?=v-zaWa7r68GT@Xm
kn7oTmO-K-Ga%x3ta%oAbilOD?k9-!G!WNsY_;>mN0NjW&!2kdN

delta 148
zcmeydoAL8*#tlJyk`g(Ixk)LBD(R^u&N=zX*`9d;`I&hoDkhV2_@qs6$r>{<;F2<$
qyq8Z+L;z}RYDH>tX-TSzAtQtFWCb3%$!GY)1<@r9Hrw;>^aB7oPBM%D

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeItemCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeItemCmd.class
index a57799b9dc40d7f010845aafd7802bc8a8538458..74bf9d0765e325cf913ea79ea5f1a2502a90a5dd 100644
GIT binary patch
delta 125
zcmexV^r>jW2_7b6lgX!e%$bahCwuWKG8r39R^xSLGB%u?%PYfbY{1AMH@SdUlqV=P
zH@_@Z#mEvWzzGwun0%I3lF7&%LYYlg;FD%DG6hj$Mkb65f;ow~NhygcsTHZor6oWE
Lj5i1JDQW`%pJO4n

delta 125
zcmexV^r>jW2_7aRv&pA;%$bZ#CwuWKG8vgnR^xSLGBTc=%PYfbWW>lIH@SdUlqV=P
zH@_@Z#mEpUzzGvDn0%I3lF85#LRm~!;FD%DGzU>)hGvWmf;ow~NhygcsTHZor6s8<
LhNhbX`4qJQo(CbZ

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/AbsenteeismItemCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/AbsenteeismItemCmd.class
index b6cd91a2cbadb36fc5f65dc609a0064148f1b620..67a01e8c4239775879c110b7823d6ad9208c558c 100644
GIT binary patch
delta 15
WcmaE*@JeBWGYgZk>1J0JRUQB?;RK@q

delta 15
WcmaE*@JeBWGYgZE`DRxZRUQB?<^-ew

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/BeAwayItemCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/BeAwayItemCmd.class
index b224be85c2e4f6fd9eeaf3b641d86c2a514d8726..5ce8a1499907549ae68da1a4870e88871179c41e 100644
GIT binary patch
delta 15
WcmaDW`&M=XKMRww*=9kOJ6r%QfdugY

delta 15
WcmaDW`&M=XKMRwQ#b!a4J6r%Qh6M5e

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/BeLateItemCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/BeLateItemCmd.class
index 5e9eb1c855307c98a17e38775c46be592414b37e..f523501bb11e07fd7c8e5e81f1e9046177813cff 100644
GIT binary patch
delta 15
WcmbQGFiT;B9Sf7O`DO=}TigIAPz0|4

delta 15
WcmbQGFiT;B9Sf6@<z@$#TigIARRpjA

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/LeaveEarlyItemCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/LeaveEarlyItemCmd.class
index fc97a43632e57abae451155cc1b4d6e69d87240a..332e4a24bb51936ca174ab94fb737df7da4af061 100644
GIT binary patch
delta 21
ccmZ3huvTG%GYg9aBZKPXM0VlLQ7o6a0Ym`>@c;k-

delta 21
ccmZ3huvTG%GYg9WBZKPXM0VlLQ7o6a0YjMu=>Px#

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/VacationItemCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/VacationItemCmd.class
index d083c3e196c91bcaad8797684696f90179e65f00..88d549bf66832859042925f8ff4f2792e1ad5c56 100644
GIT binary patch
delta 21
ccmew)`$=|#5DSYXBZJE1eh$ga`YeaJ08AJLJpcdz

delta 21
ccmew)`$=|#5DSYTBZJE1eh$ga`YeaJ086k2H2?qr

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/WorkOvertimeItemCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/WorkOvertimeItemCmd.class
index 7c16576517ca2cba83ca21a473489f6ca61227d5..ef96bea5b683e98be1705cb0327dffefc54a447d 100644
GIT binary patch
delta 27
jcmbOzKT&>z5(}G&0V9K%#^m#ivXgHy@@@`dvF8Q=XV3>u

delta 27
jcmbOzKT&>z5(}HL5hH_{#^m#ivXgHy@@@`dvF8Q=XW<7=

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class b/target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class
index b5d4c03e6a13b73a4e29d2af7179cbe400442ca7..f421799fc3ed8fed64d13453e99215a54d1fb3f5 100644
GIT binary patch
delta 15
WcmaE*{7QL)J`0nH;budYoxA`qF9j0-

delta 15
WcmaE*{7QL)J`0nv@n%DooxA`qGzAm@

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.class b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.class
index 0ec4d129083c7645755ebf733f52b25c17fc273c..b73ed04422bbb32a9fdf9360d06ad6f09bffbfb6 100644
GIT binary patch
delta 51
ycmexo)@Z)Ljg?V(@*Y-2RudCO29?Pd8O0|zvkJq+j2RigvP>pMoA0qM5Cs5vlMW65

delta 48
wcmZoP|7W(rjg?Vp@;+8Y7IQ`hmB|+w#V5D03PXj=7#YBFjHa6(vMvw>090ZPe*gdg

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.class b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.class
index 6083f90abce4b34112970dbd5bacfdcb097fab5d..052a2a1ed7ce81c110c81cdd24cc725bfeb8dec8 100644
GIT binary patch
delta 36
scmZoQZ#Cbrk(JfNoRL9g@;ess$!A%Om`uzjGqRa6nV4?2Wb+XP0L9%2p#T5?

delta 36
scmZoQZ#Cbrk(Jfhl954W@;ess$!A%On2aqZGqRa68JlmmWb+XP0LBOjqyPW_

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 03ddfd0a5149e5b26cb74b38cf15fc60c2ef8eec..8cb3f6ecd48073e2a176f5e2b560fa1b4ba47beb 100644
GIT binary patch
delta 87
zcmexg-d3?;3J;^w<cqutOr|E2xAAB|IIO0|j0|95R#PJ=i^<e*vIlPmOo0JRfr%wd
Mfr-UtE54(;09v{ifdBvi

delta 87
zcmZpx_+P$Z3J;^=<Oe(otY(Z1${LgPWW**vli~x5DKaxMfaO?BpbSRi$v(Ut5DhFw
PFj+&GtifhSzN5MTOjH+}

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class
index c2274c29babcc50f4e73b77190725de02961e890..727bf14bc550c16bcb1b5e4dec7dcc0dbf1b9118 100644
GIT binary patch
delta 169
zcmZo)&p2^C<AxdmCNtB?bppDK(v#N+NJ^WTFfxecB<3ciB&wvRmiXr9m1Klu=BBEc
z8Be|^Ag(8hkPA;u&4x%BF*0BkH=L{}=)x#5xj|5j)y#mA0m3r1WMq(;JWEiD)zkvc
SGKaIwpe!a+)6M)s6|MlhdM)q(

delta 193
zcmbQZp0RyB<AxdmCPRbCbppDKQj^yRNJ?5VGKl6R<|d^is-&lu_~z%8WQ1hqrm9#>
zejp$&A%c(!Pfg7R%a}7Vh)fm`6k%p$Fq_;cAUWBeUwra>0glNDf}Ez}NE-5svRx7@
k!Fo&?8F0v$FfvF_ULYvNVhm##!5D^62BX1dNudf?01{$1Pyhe`

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class b/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class
index 69936b68eaeb0fe11a0fd21d0b9a89d6774a41cd..8ab244a95af8c01585511f809f3affd72de225e1 100644
GIT binary patch
delta 4405
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

delta 3435
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
ZXdK(mQ!_m+%hLvVT7jn(d0GiR{twNIxDx;X

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class
index 5f48f0d2b2cb0e4292a21d3ac07119f9410af30a..36a82b943c3bda9b121206901ac78de4771f7ca4 100644
GIT binary patch
delta 93
zcmZ2gzqWqEI(|l-$?N&GSPhLB8H^_<DhN;hz^|qul#`g7l#-~Dn3tGSS)5s{Vra<7
hfGKD&*+#&E)sm4xSp%p|dh!$j6-JBAI|V-K0RV`a9gP40

delta 102
zcmZ2mzp8%2I(|m&$?N&GSWFlhj3+ay2v45C#y0sozk-@zPGW9SN}@_)USdvVab~fK
sF(U(pn9<}y6_Lro0xGPAj10;elRxrHPxez~n><%Qj?rNA9)XW~0F6~35C8xG

diff --git a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class
index 0a78013f9da55145ec055c1e1406a1a280eec4e6..9cb86e15f065c8f93faf5ed16370ac19cfcc39bf 100644
GIT binary patch
delta 39
rcmeCHolv`>nuk$-at)6hiwPrx^5j4+@yT0wgdjqU#+#q=tTY4w>`x1N

delta 42
vcmbPG+gH1xnuk$tat)6hGb4lY<UlU*$(~Z&lMnE)gGFT-4K_dLS!oCW4mk`%

diff --git a/target/classes/com/engine/attendance/attendancePlan/README.md b/target/classes/com/engine/attendance/attendanceplan/README.md
similarity index 100%
rename from target/classes/com/engine/attendance/attendancePlan/README.md
rename to target/classes/com/engine/attendance/attendanceplan/README.md
diff --git a/target/classes/com/engine/attendance/attendancePlan/cmd/GetAttendanceItemsByPersonDataCmd.class b/target/classes/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.class
similarity index 98%
rename from target/classes/com/engine/attendance/attendancePlan/cmd/GetAttendanceItemsByPersonDataCmd.class
rename to target/classes/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.class
index 3265f6c0802eabd827a5a9c23125253f0443d9ad..9fe54fb11b7f7513a96472e22332a9ddb0214a86 100644
GIT binary patch
delta 21
dcmZ4LwA5)sKRcuO<O%E+OlD@APq9Z!0svJu2NeJS

delta 21
dcmZ4LwA5)sKRctr<O%E+Os1BbPq9Z!0svIz2M_=N

diff --git a/target/classes/com/engine/attendance/attendancePlan/service/AttendancePlanService.class b/target/classes/com/engine/attendance/attendanceplan/service/AttendancePlanService.class
similarity index 100%
rename from target/classes/com/engine/attendance/attendancePlan/service/AttendancePlanService.class
rename to target/classes/com/engine/attendance/attendanceplan/service/AttendancePlanService.class
diff --git a/target/classes/com/engine/attendance/attendancePlan/service/impl/AttendancePlanServiceImpl.class b/target/classes/com/engine/attendance/attendanceplan/service/impl/AttendancePlanServiceImpl.class
similarity index 100%
rename from target/classes/com/engine/attendance/attendancePlan/service/impl/AttendancePlanServiceImpl.class
rename to target/classes/com/engine/attendance/attendanceplan/service/impl/AttendancePlanServiceImpl.class
diff --git a/target/classes/com/engine/attendance/attendancePlan/web/AttendancePlanAction.class b/target/classes/com/engine/attendance/attendanceplan/web/AttendancePlanAction.class
similarity index 100%
rename from target/classes/com/engine/attendance/attendancePlan/web/AttendancePlanAction.class
rename to target/classes/com/engine/attendance/attendanceplan/web/AttendancePlanAction.class
diff --git a/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class b/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class
index 289553aecade8d8cbcfc27b06916e5558ef85c3f..4380c8d8df3d160f5eb9f7e5e6417ee53351abd6 100644
GIT binary patch
delta 59
zcmX?KaHe2`ATNh%PGW9SN}|f-Y%UpA6(dFl<;i@^;*;B@_!wm-C-O=&8cwd`wT7|{
KHecth&;kGi2@nGS

delta 62
zcmX?8aK2!JATNhnPGW9SN}|f-Y%Uo#6*FT-2Ia|o%;J+*%JMPFPEO#JW->FHT*GS(
M;}~wf!dsyQ05-%B%m4rY

diff --git a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.class b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.class
index fe5f6f4037cf3d497472ce55c2a10c461b5e6095..6c5d3e93d4b415f1505579d61d3370e20206ef70 100644
GIT binary patch
delta 42
xcmX>oe@K3VE3>FzPGW9SN}@_?MQU<sNvevuAtQs?WCaen$vPaon_HM|c>pFx3`+n2

delta 41
xcmX>ke^7pdE3=3|PGW9SN}@_?MQU<sNvetgBZJvwMGm>iYq@zhw=&!E0014w43_`^

diff --git a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class
index 25def83a47c34d31cdd2add95e982930df55a9ce..a00c46a9d81595c35adb6ba1b453d7fe5dd8334b 100644
GIT binary patch
delta 29
lcmca;b<t`=A}g!8F(ZS@<cFM+lj~U(naqtgFJfIU4gio&2^s(Z

delta 29
lcmca;b<t`=A}gzz86$(r<cFM+lj~U(naoT#FJfIU4gipV2_66d

diff --git a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class
index d00811d3848e12ce753c68d70169a864409c80a4..1da1568931e99f2e42a3d0961dc005160a1852b7 100644
GIT binary patch
delta 33
pcmeCM?y%la!pdrH%E+KHxsh9V@&Oj^$<tY7n9NN!Z)LqK4gjS*3F!a;

delta 33
pcmeCM?y%la!pdr9!N{O8xsh9V@&Oj^$<tY7n9R&KZ)LqK4gjTg3GDy?

diff --git a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class
index c1474e9c50b2d9d02ca7f7ac25d8263ef830bb95..83836d847a2cffa071f4331c9f5d667677ad7ea2 100644
GIT binary patch
delta 29
kcmeCQ>$KZ&gq78tkwHacvIC36<cF+^Oy*{rS=d-50f0mYWB>pF

delta 29
kcmeCQ>$KZ&gq78RkwHacvIC36<cF+^OlFpwS=d-50e`#)UjP6A

diff --git a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class
index 24b056ae17e1a6e1c7b0661c0d55a7e6c82da0d2..09dc8165b6ab34133fe9ca923d0e6fb1f413097a 100644
GIT binary patch
delta 20
ccmdmBx4~}1epW`y$p={N7%evcXEl@r099rOTL1t6

delta 20
ccmdmBx4~}1epW`K$p={N7!5c7XEl@r095D)O#lD@

diff --git a/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class b/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class
index c5762b7e3a95cac0f4bd34c4fb46e0c89d0b0305..0a2b79e5be580d2830cc7a93252e3a12291ff1c9 100644
GIT binary patch
delta 3196
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
C;&!qC

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

diff --git a/target/classes/com/engine/attendance/enums/ApplicableOrganizationEnum.class b/target/classes/com/engine/attendance/enums/ApplicableOrganizationEnum.class
new file mode 100644
index 0000000000000000000000000000000000000000..34b60c85312a3830320b4f9d3c810531a952fdce
GIT binary patch
literal 1816
zcmbtUQF9Yj6#j0r$=+<YlrC+xwbEKak|2ZvB9K~}wgD??61#0?GCJdI(<LlyH%zi&
zMqhOtAAIpie*%vhM4U1@Jo`Ij9R7skIX62PXn3jnuy@aQ&-u<d-??}H{Ad3U02fhB
zLPO5LB0kV@Qpb{kX?)19W!}m2Yeiy4VpU?zAgjR8HHqUA*Cjq;Yh7Yi;$w*$Y!xNu
zBsL^UY?XCXbbKO^tQ0owa;a1(3S2JMn|oO|Xn28}b;8gMcAcQ^64KdgXY+UO`d;1H
z@!fK(;RN27PUtm*0`27lMxWDsetomNT@f(W3YGlk)<&VUMTWh-vRdA#<V!Vy*d6x^
z0jqf1x#whkCun5tu;m2}qKV&g{EjQ2pQz@G+XY+T%BP1fDxuig0=ZQBf6!>F&0VT#
zv`Dg)I(s{AYl~H&DiweEra&=uu$%PZ3%82Ry5m=!mdA;rY+B&#QPRYs7kJ^4z|{dc
z*AJF)5J^`BwD6Wk!X$045jbI|MZ~8D@C^=5G~Dn8&u~1IKIkDJX}{VVq+G1~QN6Jg
zC%)Aez-MRiuqrL(ROC%BP-ir3HvKzZm|bz&ZgeIMyV+^g-D@7tYWCH~_beYo6DRnh
zoiwotI(C;1cN0uxuw~*bwoSZ+c@uAAUO=3qvHi8b|MdGGc`s{X25%C)AYk_3r{8|_
z_v5ck99Q^xa)0*K{bxViH!-V_3xtplfhOh{Ir87-;cf+HxZqcbK^Lp;Hv^L4#fg=7
zZoBo6?%jL+vtRX{c01QMr|5e2&pMKLvOg|zTTfS)7w8u=4S_eHFHdo|0Ik%WTB#?s
zQYZAc8)Bu@N@4*=r+E@&Cy>NDI7KWevgT>!$LK=*ilHZn{X~{Pn%)VuC&@p9(~<v0
z;^hd#(lWmx{sbEP553_3E+J;m3umGlXguV_89ze|aayg+>6u4JWX?Q<o|)1fLjL@m
z$)Y~VgDN<NVT@x86JXXkie>zq>X5&<#~#LAYFJPl=PCOI`rr3@%+ks=$1}e`f4SUg
zMcgYl9ud>v1_sNQgJ%Z>OI*VHQReTc1AcZNL#tWIm}OYQk6=E)hyspi)~Iz<0b>fV
z;?^;1Tmcgbm`qr&S+6T#O8=cmVqJ{bHLZ&=yB6<a!mcH{n6e*0uzJ0@O)7m2Qf-(t
VF-eILtU;3gJ#{YQ3i%G<>c7_cqZj}H

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class b/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class
new file mode 100644
index 0000000000000000000000000000000000000000..7b1c60acc44f22fa5887ba3a39359118db96f573
GIT binary patch
literal 9616
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

literal 0
HcmV?d00001

diff --git a/target/classes/com/engine/common/util/CommonUtil.class b/target/classes/com/engine/common/util/CommonUtil.class
index 4b7f544cc5cc21299cc1115de8e49de2a4ad6344..0ae3e78c7b107b4d05317876633494d7a88b692e 100644
GIT binary patch
delta 30
mcmbR1I@fgrBPW}MDI<fj#^j%jDwDN2g_$f&Hal>}N&*0YCI_hi

delta 30
mcmbR1I@fgrBPW}=1tWv9#^j%jDwDN2g_+FFH#=~~N&*0YS_iEF

diff --git a/target/classes/com/engine/common/util/DbTools.class b/target/classes/com/engine/common/util/DbTools.class
index 8b2849f4dc9cfbc303610c8ce106dd8dc84d01bc..6e4e5cd3a3bbd39ac715ee4f1d273ea2c5bbf908 100644
GIT binary patch
delta 15
WcmZowY*pOA#mZ!1wwZ^uk{bXatpmgW

delta 15
WcmZowY*pOA#mZ!ExtWKxk{bXaxC6!j

diff --git a/target/classes/com/engine/common/util/Utils.class b/target/classes/com/engine/common/util/Utils.class
index 19efde80ac2750dc671ba54247ed5f26d29d1104..6c630139230bca9da26b2eeb9c69f2dc643b4c5f 100644
GIT binary patch
delta 90
zcmew}hp}NU;|38CU6Gu`+@zF5mGsmSkHnlbm&8gHO9Ms*Aq}6b#Ii*F(vr*^ec!|a
rYt1M|2C2yoA`(m%mXjkzG#J4gRtpP828qe@M8udZ%r|cpIc^C6<9-=}

delta 86
zcmZpe%lKyw;|38C9pRkB+@zF5mGsmSkHnlbm&8gH6GjFh4WF#UvPAvTlFS@^-^2oI
n%_v3&$;pl)5{$-^qeV0r!E6>IMh5Z83q`~j4L9!;Ic^C6fv*^r

diff --git a/target/classes/weaver/formmode/customjavacode/modeexpand/DeleteCheckCalendar.class b/target/classes/weaver/formmode/customjavacode/modeexpand/DeleteCheckCalendar.class
new file mode 100644
index 0000000000000000000000000000000000000000..987896a68b48e3000fce8c31920ab02fcf358a3d
GIT binary patch
literal 1860
zcmbtVOLG)e6#nkKx|vJ_h9nTwNEFD^G$MpYLU@Ek67tZ5gmTBt%*~`pPxsi<L(p=8
z8`08@7B1p~f-0-5Vj-|V3{;^j7yb^CO8$iS-ARW`f+bo`rn>Jv&+mNaoXH=5K6(P+
z5GIqT!4U&TlZfDmiH0g1!*K&$Cb|urNWw%<5+`v=pH7=NW1?4^oHfyBqTj%KCe9fc
zFfb^P=(b%u=n;rEw@eDedcCX?*g9mpYNV8(QvL-w<xr9y@-otyl)kO+p)eNA*hPVp
zLvu=AQNA_p`T0BpSea5W@bZ`C6`9djEmKzu(#=|Dm7@aHJEJnQz0y%`R{C86sjN3l
zo4&G*z@FwI?Q4|++p&gap{r%noj^-P<qK?IOFiS~tqF=4EHPy}j-3?{1H9<m`cmbq
zk4mZ-47k&tK+Bq6(UaDk=g&?%-kcShSYzv^j3-!r?J59Ax;d-wYDN_T+jFUl7o;!q
zny`(4nb=pwk`oBjZDj7_!Ww&rH~Mr}q!<r;+s$=VNJghFt4z?<!<_%gFN~!9s>cJF
znI)a&?v)4NJg0^u!;ui!GH&Nw8I*jM>uhSkzr?nwP5<mwfh;-hmHdqAxAmm$`kN8y
z(CnsAi#oP^o#}J3IKz4joKIm0!)!x1h-=fpwpa90pefY9tm`R^VAR0-DSUvj6vi>i
zhAQ9B7jps)OAo$UzWd$c7q?dCe^|P8d*#m8E7u+`Klx_q+k1<j&!=z!6CBWKN76Vx
zEuA8(+EGTmaeg>f%h&HL{`CFRg)bMcKU%pl|Mb_}OP}2pIPt$0N}&5C{->vkfiE+`
z`qB-OV7>bzYL1h#PBH1_Z$nOTkoSi}Q7$5!$FSp-B5pIyL)!J`)ihUHg>5GzA;z3?
zl`kD@g3Hc+(RaWNCZ$u-Ygd^v^laf)SJUcZxV1V(v``|zqm|Ynz!z7j5=>}>M(p5k
zs{Ta4tf=F2CvO(tg70|iLx}rj^)5aWWnnGqc}}ewU^ianP2e@W&LDIa*ARt4*{6>Y
z`S2m4!)@u<0^$+;hQvsuGZyKLx226xVjfS_Cw@m`ed1?q`31?&m_AkMQ@l2I6J~Av
zCZg@>RJwWruS9XNJ-s!(ZT0vgc8_RH`UOq<Jt8u32^nlh3>y0xY~!<$(zjUhULxH`
z?EBHgzjidE6D>G}Rt%y86C~gg-lg{eWbqC>9K<L552WiJV}u%RT?5`=ojWmrJ&YP-
ztbV-7Q=IXRF~?rAl_jD3m?Ns$2$|BSCg#)l0_JQcYpvAR@x7{Rd#-Dz>}^Ur5Pe2q
khJg+PR{48C2!qJ*jKxKt%R%A6IwIE%J;XSN%csu20G@#Bm;e9(

literal 0
HcmV?d00001

diff --git a/target/test-classes/Test2.class b/target/test-classes/Test2.class
index a02e659d8aba6016f4b0e21b6ab3026520cc45c8..6c7d876923202169e8e905b8bdda588be3f2929f 100644
GIT binary patch
delta 14
Vcmdlfu~TA$BQvA%W+&$F8~`R51i}CS

delta 14
Vcmdlfu~TA$BQvAXW+&$F8~`Q~1i=6R

diff --git a/target/test-classes/TestGetClockInPoint.class b/target/test-classes/TestGetClockInPoint.class
index b6764d8c82251b1fb6fc418b1faed9c47f085276..253fad57812dee9bbaee9025800904dc6c8e122a 100644
GIT binary patch
delta 26
icmaE#`#yKW4lYKs$ve4>8BHh8<C0=D+04QHTpIwD@(F_g

delta 26
icmaE#`#yKW4lYKc$ve4>84V}T<C0=D*v!HGTpIwDVhMKu

diff --git a/target/test-classes/TestMergeAskForLeaveAndEvctionSchedule.class b/target/test-classes/TestMergeAskForLeaveAndEvctionSchedule.class
index 04efb75595cf23bb185d65296da04c50470f1757..01a9b77bc4458037f81da1e19bd565d2dc5623d3 100644
GIT binary patch
delta 21
dcmcbrcvW%34Q3W|Mh4@_57~t`zh{2N0{~i|2n+xK

delta 21
dcmcbrcvW%34Q3VtMh4@_57~t`zh{2N0{~h?2n7HD

diff --git a/target/test-classes/TestObj.class b/target/test-classes/TestObj.class
index cd7198468ee05ba28b3bec05b50217e7a4dcbf1e..efd434a79a1365b4b4072807aed86a2ef054cee8 100644
GIT binary patch
literal 603
zcmZuu%TB^T6g@+srL{^eg6{{us3zLPxWlk9an+~^gpI2K8ywOHX^V-Ur3*}4_yK;D
z@wSi%3A4B}_uRSXo-_0F`}Gar8kPnH6%|#i7qOvX6I&X#v7=yD!5)KrBLa~$86@kh
z!;rrXpIwHMBLeq+<agbu&AT2UrW5wK*Wr;!^C_55UPR2GI&C*j9=d}D5%^pL3{~sN
z8Sqzbdpzjdtt1jbzmW~#QJ-4M3(5>yD;z~V_fDh}^(pCP%A=zQRl&ZF1JoGUg@QvJ
zM>tk+qT>{G24#Am!T6s{qTF6G2esbf#P!K=IHE#jB2$F+BWX-Xsmp!xF~c!Y&rpbm
zo}iYxwZPg!KjlowJU0m)rjtB+rOG0v4r-9;)6$g#ON~?1D6?s2v=`1l!QQj-5=A)!
zCFpe4Cl|1c70OhUU=WfvHz8#;;{!QUGNm!{($yG+e;$p-5jpk9Gh7B%VG>S%MlpxA
EKXCAW6951J

delta 242
zcmYjJI|{-;6rB8a&By;=1hEoq7Qx2OOLzha5->@TSbK(?LlCSK3lHEGJcSn!XSLAX
zee-tSyqSl6v<COr^#)*$z6To(4^6Zr+7g{&a_}7piEe-%MDZN$hwC&}VX}#mQ1Kh5
ziQ47SR;>t`0VfZ$e1<VBM(JaMLkOZIQ|t!2Gd;sNedH2R%b>+22HypE@X1{AGAG)+
fU@i5cyujr9`787?lqh)RUyeitRcZ!mL=*Kl;xZgA

diff --git a/test/TestObj.java b/test/TestObj.java
index 9dcc241..85ac953 100644
--- a/test/TestObj.java
+++ b/test/TestObj.java
@@ -2,7 +2,6 @@ import com.engine.common.util.Utils;
 
 public class TestObj {
     public static void main(String[] args) {
-        Utils.test1();
-        Utils.test1();
+       System.out.println("-".split("-")[0]);
     }
 }