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> selectItemLists = DbTools.getSqlToList(sql); Map>> selectItemMap = selectItemLists.stream().collect(Collectors.groupingBy(e -> e.get("fieldid").toString())); + + sql = "select fieldid,selectvalue,selectname from cus_selectitem"; + List> custSelectItemLists = DbTools.getSqlToList(sql); + Map>> 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 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 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 getHrmCondition(Map 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> { + @Override + public BizLogContext getLogContext() { + return null; + } + + + public GetPersonDateBySuitOrganzation(Map params){ + this.params=params; + } + + @Override + public Map execute(CommandContext commandContext) { + String modeId = Util.null2String(params.get("modeId")); + String sql = "select dxlx,aqjb,dataid,dx from uf_syzz where modeid=?"; + //假期额度适用组织所有值集合 + List> 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> vacationList = DbTools.getSqlToList(sql); + //人力资源id，（假别，规则id） + Map personMap = Maps.newHashMap(); + //人员分组id，（假别，规则id） + Map personOrganzationMap = Maps.newHashMap(); + //部门id，（假别，规则id） + Map departMentMap = Maps.newHashMap(); + //分部id，（假别，规则id） + Map subCompanyMap = Maps.newHashMap(); + + //以假期额度生成规则id分割的适用组织所有值集合 + Map>> organzationCollect = organzationList.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("dataid")))); + //规则id-对象id，安全级别 + Map organzationByMap = Maps.newHashMap(); + for (Map 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 vacationMap = vacationList.stream().collect(Collectors.toMap(e->e.get("dataid").toString(),e->e.get("jb").toString())); + + Set personOrganzationIds = Sets.newHashSet(); + Set departMentIds = Sets.newHashSet(); + Set subCompanyIds = Sets.newHashSet(); + for (Map 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 psersonSet = (Map)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 personOrganzationSet = (Map)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 departMentSet = (Map)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 subCompanySet = (Map)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> hrmListByDepartAndSubCompanyIds = DbTools.getSqlToList(sql); + //分部id-人员id集合 + Map>> hrmListGroupByDepart = hrmListByDepartAndSubCompanyIds.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("departmentid")))); + //部门id-人员id集合 + Map>> hrmListGroupBySubCompany = hrmListByDepartAndSubCompanyIds.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("subcompanyid1")))); + //人员分组id-人员id集合 + Map> personGroupUserIds = getPersonGroupUserIds(personOrganzationIds); + + //人员分组id-（假别，假期规则id） + for (Map.Entry entry : personOrganzationMap.entrySet()){ + String personGroupId = entry.getKey(); + //人员分组（假别，假期规则id） + Map personGroupHolidayMap = (Map)entry.getValue(); + Set userIds = personGroupUserIds.get(personGroupId); + for (String userId :userIds){ + //人力资源原本已有的假期，（假别，规则id） + Map psersonSet = personMap.get(userId) == null?null:(Map)personMap.get(userId); + if (psersonSet == null) { + personMap.put(userId,personGroupHolidayMap); + }else { + Map newMap = Maps.newHashMap(); + for (Map.Entry personGroupHolidayEntry :personGroupHolidayMap.entrySet()){ + if (psersonSet.get(personGroupHolidayEntry.getKey()) == null){ + newMap.put(personGroupHolidayEntry.getKey(),personGroupHolidayEntry.getValue()); + } + } + personMap.put(userId,newMap); + } + } + } + //部门id + for (Map.Entry entry : departMentMap.entrySet()){ + String departMentId = entry.getKey(); + //部门（假别，假期规则id） + Map departMentHolidayMap = (Map)entry.getValue(); + List> userIds = hrmListGroupByDepart.get(departMentId); + for (Map userIdMap :userIds){ + //人力资源原本已有的假期，（假别，规则id） + String userId = Util.null2String(userIdMap.get("id")); + Map psersonSet = personMap.get(userId) == null?null:(Map)personMap.get(userId); + if (psersonSet == null) { + personMap.put(userId,departMentHolidayMap); + }else { + Map newMap = Maps.newHashMap(); + for (Map.Entry personGroupHolidayEntry :departMentHolidayMap.entrySet()){ + if (psersonSet.get(personGroupHolidayEntry.getKey()) == null){ + newMap.put(personGroupHolidayEntry.getKey(),personGroupHolidayEntry.getValue()); + } + } + personMap.put(userId,newMap); + } + } + } + //分部id + for (Map.Entry entry : subCompanyMap.entrySet()){ + String subCompanyId = entry.getKey(); + //分部（假别，假期规则id） + Map subCompanyHolidayMap = (Map)entry.getValue(); + List> userIds = hrmListGroupBySubCompany.get(subCompanyId); + for (Map userIdMap :userIds){ + //人力资源原本已有的假期，（假别，规则id） + String userId = Util.null2String(userIdMap.get("id")); + Map psersonSet = personMap.get(userId) == null?null:(Map)personMap.get(userId); + if (psersonSet == null) { + personMap.put(userId,subCompanyHolidayMap); + }else { + Map newMap = Maps.newHashMap(); + for (Map.Entry 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> getPersonGroupUserIds(Set 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> personGroupDataList = DbTools.getSqlToList(sql); + + Map> personGroupUserIds = Maps.newHashMap(); + for (Map 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 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> dataList = DbTools.getSqlToList(sql); + for (Map 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 7c9b89d..504cf3e 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.class differ diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.class index a0e934f..45461f5 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInPointCmd.class differ diff --git a/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeItemCmd.class b/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeItemCmd.class index a57799b..74bf9d0 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeItemCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/GetClockInTimeItemCmd.class differ 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 b6cd91a..67a01e8 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/AbsenteeismItemCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/AbsenteeismItemCmd.class differ 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 b224be8..5ce8a14 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/BeAwayItemCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/BeAwayItemCmd.class differ 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 5e9eb1c..f523501 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/BeLateItemCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/BeLateItemCmd.class differ 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 fc97a43..332e4a2 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/LeaveEarlyItemCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/LeaveEarlyItemCmd.class differ 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 d083c3e..88d549b 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/VacationItemCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/VacationItemCmd.class differ 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 7c16576..ef96bea 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/WorkOvertimeItemCmd.class and b/target/classes/com/engine/attendance/attendanceanalysis/cmd/item/WorkOvertimeItemCmd.class differ diff --git a/target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class b/target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class index b5d4c03..f421799 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class and b/target/classes/com/engine/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class differ 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 0ec4d12..b73ed04 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.class and b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.class differ 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 6083f90..052a2a1 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.class and b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.class differ 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 03ddfd0..8cb3f6e 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.class and b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/UtilServiceImpl.class differ 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 c2274c2..727bf14 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class and b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class differ diff --git a/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class b/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class index 69936b6..8ab244a 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class and b/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class differ diff --git a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class index 5f48f0d..36a82b9 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class and b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class differ diff --git a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class index 0a78013..9cb86e1 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class and b/target/classes/com/engine/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class differ 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 3265f6c..9fe54fb 100644 Binary files a/target/classes/com/engine/attendance/attendancePlan/cmd/GetAttendanceItemsByPersonDataCmd.class and b/target/classes/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.class differ 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 289553a..4380c8d 100644 Binary files a/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class and b/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class differ 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 fe5f6f4..6c5d3e9 100644 Binary files a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.class and b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/SchedulingJob.class differ 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 25def83..a00c46a 100644 Binary files a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class and b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class differ 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 d00811d..1da1568 100644 Binary files a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class and b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class differ 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 c1474e9..83836d8 100644 Binary files a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class and b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class differ 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 24b056a..09dc816 100644 Binary files a/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class and b/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class differ 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 c5762b7..0a2b79e 100644 Binary files a/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class and b/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class differ 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 0000000..34b60c8 Binary files /dev/null and b/target/classes/com/engine/attendance/enums/ApplicableOrganizationEnum.class differ 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 0000000..7b1c60a Binary files /dev/null and b/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class differ diff --git a/target/classes/com/engine/common/util/CommonUtil.class b/target/classes/com/engine/common/util/CommonUtil.class index 4b7f544..0ae3e78 100644 Binary files a/target/classes/com/engine/common/util/CommonUtil.class and b/target/classes/com/engine/common/util/CommonUtil.class differ diff --git a/target/classes/com/engine/common/util/DbTools.class b/target/classes/com/engine/common/util/DbTools.class index 8b2849f..6e4e5cd 100644 Binary files a/target/classes/com/engine/common/util/DbTools.class and b/target/classes/com/engine/common/util/DbTools.class differ diff --git a/target/classes/com/engine/common/util/Utils.class b/target/classes/com/engine/common/util/Utils.class index 19efde8..6c63013 100644 Binary files a/target/classes/com/engine/common/util/Utils.class and b/target/classes/com/engine/common/util/Utils.class differ 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 0000000..987896a Binary files /dev/null and b/target/classes/weaver/formmode/customjavacode/modeexpand/DeleteCheckCalendar.class differ diff --git a/target/test-classes/Test2.class b/target/test-classes/Test2.class index a02e659..6c7d876 100644 Binary files a/target/test-classes/Test2.class and b/target/test-classes/Test2.class differ diff --git a/target/test-classes/TestGetClockInPoint.class b/target/test-classes/TestGetClockInPoint.class index b6764d8..253fad5 100644 Binary files a/target/test-classes/TestGetClockInPoint.class and b/target/test-classes/TestGetClockInPoint.class differ diff --git a/target/test-classes/TestMergeAskForLeaveAndEvctionSchedule.class b/target/test-classes/TestMergeAskForLeaveAndEvctionSchedule.class index 04efb75..01a9b77 100644 Binary files a/target/test-classes/TestMergeAskForLeaveAndEvctionSchedule.class and b/target/test-classes/TestMergeAskForLeaveAndEvctionSchedule.class differ diff --git a/target/test-classes/TestObj.class b/target/test-classes/TestObj.class index cd71984..efd434a 100644 Binary files a/target/test-classes/TestObj.class and b/target/test-classes/TestObj.class differ 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]); } }