Merge remote-tracking branch 'origin/main'

zm_dev
sy 1 year ago
commit 84c86763d9

@ -1 +1 @@
<EFBFBD><EFBFBD><EFBFBD>}<EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>Z譿<EFBFBD>y<EFBFBD>Q<EFBFBD><EFBFBD> <EFBFBD>[<EFBFBD><EFBFBD>鵿<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

@ -10,134 +10,125 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment=""> <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/MakeUpClockInService.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/MakeUpClockImportAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/MakeUpClockInAction.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/workflow/request/hrmattendance/HrmCustomCard_e9.jsp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_src_/schema/HRM_TEST.zrbasQ.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_src_/schema/HRM_TEST.zrbasQ.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_src_/schema/HRM_TEST.zrbasQ.zip" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/storage_v2/_src_/schema/HRM_TEST.zrbasQ.zip" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/log/sdk.log" beforeDir="false" afterPath="$PROJECT_DIR$/log/sdk.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" afterDir="false" /> <change beforePath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/api/kq/browser/service/impl/jucailin/KQCycleSetBrowserService.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/MakeUpClockInService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/MakeUpClockInService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/api/kq/jucailin/KQCalendarSettingActionApi.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/api/kq/jucailin/KQCommonActionApi.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/api/kq/jucailin/KQCycleSettingActionApi.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/api/kq/jucailin/KQPersonGroupActionApi.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/bean/KQHolidaySetWithCalendarSet.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetBiz.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/browser/service/impl/jucailin/KQCycleSetBrowserService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetComInfo.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCalendarSettingActionApi.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/GetCalendarSettingFormCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCommonActionApi.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCycleSettingActionApi.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQPersonGroupActionApi.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidayCountWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetCalendarWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetFormWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/GetImportFormWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DbTools.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DbTools.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/GetRightMenuWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/GetSearchListWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSet.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/GetSyncFormWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetBiz.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/HasRepeatDataWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetComInfo.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/InitHolidaySetWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/SaveImportWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/calendar/holidaySet/SyncHolidaySetWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/common/InsertDataCommonCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/common/QueryDataCommonCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidayCountWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/cycle/GetCycleListCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetCalendarWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetFormWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetImportFormWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetRightMenuWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/cycle/GetCycleSettingTreeCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSearchListWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/cycle/GetCycledetailFormCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSyncFormWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/HasRepeatDataWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/InitHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SaveImportWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SyncHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/enums/FieldHtmlTypeEnum.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/InsertDataCommonCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/exception/AttendanceRunTimeException.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/QueryDataCommonCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/exception/ExceptionUtil.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/genid/DefaultWorker.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/genid/IdGenerator.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/genid/SnowflakeId.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/genid/Worker.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/service/KQCalendarSettingService.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/service/KQCommonService.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/service/KQCycleSettingService.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/service/KQPersonGroupService.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/service/impl/KQCalendarSettingServiceImpl.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/service/impl/KQCommonServiceImpl.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingTreeCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/CommonUtil.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/Constant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/Constant.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/DateUtil.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/DbTools.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/KQDateUtil.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$3.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/ListConversionMethod.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/PageUidFactory.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/util/ResponseResult.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/web/KQCalendarSettingAction.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/web/KQCommonAction.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/web/KQCycleSettingAction.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupSearchConditionCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/jucailin/web/KQPersonGroupAction.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/kq/biz/KQLeaveRulesComInfo.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/kq/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/com/engine/kq/service/impl/KQHolidaySetServiceImpl.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/enums/FieldHtmlTypeEnum.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCommonActionApi.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCommonActionApi.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/exception/AttendanceRunTimeException.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCycleSettingActionApi.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCycleSettingActionApi.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/exception/ExceptionUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd$1.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/DefaultWorker.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/IdGenerator.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/SnowflakeId.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/Worker.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCalendarSettingService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCommonService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/InsertDataCommonCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/InsertDataCommonCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCycleSettingService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQPersonGroupService.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCalendarSettingServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$1.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCommonServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$1.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$2.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$3.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$1.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/Constant$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$2.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/Constant.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/DateUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$1.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/DbTools.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$2.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/KQDateUtil.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ListConversionMethod.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/PageUidFactory.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQPersonGroupService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQPersonGroupService.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ResponseResult.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCalendarSettingAction.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCommonAction.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$1.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCycleSettingAction.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$2.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQPersonGroupAction.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$3.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/biz/KQLeaveRulesComInfo.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/DbTools.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/DbTools.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/service/impl/KQHolidaySetServiceImpl.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/PageUidFactory.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/PageUidFactory.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ResponseResult.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ResponseResult.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCalendarSettingAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCalendarSettingAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCommonAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCommonAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCycleSettingAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCycleSettingAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQPersonGroupAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQPersonGroupAction.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestObj.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestObj.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/test-classes/TestObj.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestObj.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/test-classes/TestOneTimePayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestOneTimePayMentWay.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/target/test-classes/TestOneTimePayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestOneTimePayMentWay.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/TestObj.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestObj.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/test/TestObj.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestObj.java" afterDir="false" />
@ -184,7 +175,7 @@
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File" value="PLAIN_TEXT" /> <property name="com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File" value="PLAIN_TEXT" />
<property name="last_directory_selection" value="$PROJECT_DIR$/src/com/engine/kq" /> <property name="last_directory_selection" value="$PROJECT_DIR$/src/com/engine/kq" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../../easyentry" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/workflow/request/hrmattendance" />
<property name="nodejs_package_manager_path" value="npm" /> <property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
@ -193,11 +184,11 @@
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="D:\项目备份\考勤\hrm-attendance\workflow\request\hrmattendance" />
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\cmd\personGroup" /> <recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\cmd\personGroup" />
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\web" /> <recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\web" />
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\util" /> <recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\util" />
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\service\impl" /> <recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\service\impl" />
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\service" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\cmd\calendar" /> <recent name="D:\项目备份\考勤\hrm-attendance\src\com\engine\jucailin\cmd\calendar" />
@ -210,7 +201,7 @@
<recent name="com.engine.jucailin.cmd.calendar" /> <recent name="com.engine.jucailin.cmd.calendar" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Application.TestOneTimePayMentWay"> <component name="RunManager" selected="Application.TestObj">
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Test" /> <option name="MAIN_CLASS_NAME" value="Test" />
<module name="hrm-attendance" /> <module name="hrm-attendance" />
@ -260,8 +251,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.TestOneTimePayMentWay" />
<item itemvalue="Application.TestObj" /> <item itemvalue="Application.TestObj" />
<item itemvalue="Application.TestOneTimePayMentWay" />
<item itemvalue="Application.Test" /> <item itemvalue="Application.Test" />
<item itemvalue="Application.TestMain" /> <item itemvalue="Application.TestMain" />
<item itemvalue="HTTP Request.generated-requests#1" /> <item itemvalue="HTTP Request.generated-requests#1" />
@ -594,7 +585,14 @@
<workItem from="1710307924702" duration="366000" /> <workItem from="1710307924702" duration="366000" />
<workItem from="1710315152144" duration="722000" /> <workItem from="1710315152144" duration="722000" />
<workItem from="1710383236542" duration="8378000" /> <workItem from="1710383236542" duration="8378000" />
<workItem from="1710466387162" duration="13805000" /> <workItem from="1710466387162" duration="18160000" />
<workItem from="1710739961375" duration="16479000" />
<workItem from="1710810972459" duration="9810000" />
<workItem from="1710826488777" duration="3647000" />
<workItem from="1710830340596" duration="22134000" />
<workItem from="1710897421350" duration="5656000" />
<workItem from="1710912514427" duration="11596000" />
<workItem from="1710984188934" duration="14595000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -637,6 +635,14 @@
<line>301</line> <line>301</line>
<option name="timeStamp" value="28" /> <option name="timeStamp" value="28" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/com/engine/attendance/workflow/service/ProcessSubmitCheckService.java</url>
<line>5</line>
<properties class="com.engine.attendance.workflow.service.ProcessSubmitCheckService" method="processSubmitCheck">
<option name="EMULATED" value="true" />
</properties>
<option name="timeStamp" value="74" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
<watches-manager> <watches-manager>

@ -0,0 +1,68 @@
package com.engine.attendance.workflow.action;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.Utils;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.conn.RecordSet;
import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* action
*/
@Slf4j
public class MakeUpClockImportAction implements Action {
@Override
public String execute(RequestInfo requestInfo) {
log.info("**********MakeUpClockImportAction import data start**********");
// 流程表单主表数据
HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
// 流程表单明细表数据
List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
//补打卡人员
String userId = mainTableData.get("bdkry");
String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_bdkjl");
RecordSet rs = new RecordSet();
String sql = "insert into uf_jcl_kq_bdkjl (bdkry,dkrq,dksj,dksm,bdklx,formmodeid,modeuuid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime) values (?,?,?,?,?,?,?,?,?,?,?)";
List<List> lists = Lists.newArrayList();
for (Map<String, String> detailTable:detailTableData){
List list = Lists.newArrayList();
list.add(userId);
list.add(detailTable.get("bdkrq"));
list.add(detailTable.get("bdksj"));
list.add(detailTable.get("bdksm"));
list.add(detailTable.get("bdklx"));
list.add(modeId);
list.add(UUID.randomUUID().toString());
list.add(1);
list.add(0);
list.add(DateUtil.getCurrentDate());
list.add(DateUtil.getCurrentTime().split(" ")[1]);
lists.add(list);
}
boolean result = rs.executeBatchSql(sql,lists);
if (!result){
log.error("MakeUpClockImportAction insert data:[{}]",lists);
log.error("添加失败");
requestInfo.getRequestManager().setMessageid("11111" + requestInfo.getRequestid() + "22222");
requestInfo.getRequestManager().setMessagecontent("添加失败!");
return Action.FAILURE_AND_CONTINUE;
}
log.info("**********MakeUpClockImportAction import data end**********");
return Action.SUCCESS;
}
}

@ -0,0 +1,170 @@
package com.engine.attendance.workflow.action;
import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.DbTools;
import com.engine.common.util.ServiceUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.BaseBean;
import weaver.general.Util;
import weaver.interfaces.workflow.action.Action;
import weaver.soa.workflow.request.RequestInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* action
*/
@Slf4j
public class MakeUpClockInAction implements Action {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
@Override
public String execute(RequestInfo requestInfo) {
String requestid = requestInfo.getRequestid();
BaseBean bs = new BaseBean();
// 流程表单主表数据
HashMap<String,String> mainTableData = CommonUtil.getMainTableInfo(requestInfo);
// 流程表单明细表数据
List<Map<String, String>> detailTableData = CommonUtil.getDetailTableInfo(requestInfo,0);
//补打卡人员
String userId = mainTableData.get("bdkry");
Map<String, Object> params = Maps.newHashMap();
params.put("userId",userId);
params.put("submitDate",DateUtil.getCurrentDate());
/**
*
*/
Map<String,Object> dataMap = makeUpClockInService.getKqCycleTimeIntervalCmd(params);
List<Map<String,Object>> dateList = (List<Map<String,Object>>)dataMap.get("data");
boolean status = (boolean)dataMap.get("status");
if (!status){
log.error("该人员没有考勤周期");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("该人员没有考勤周期!");
return Action.FAILURE_AND_CONTINUE;
}
if (dateList.size()==0){
log.error("申请人员当前时间没有考勤周期,请联系管理员!");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("申请人员当前时间没有考勤周期,请联系管理员!");
return Action.FAILURE_AND_CONTINUE;
}
try {
for (Map<String, String> detailTable:detailTableData){
String bdkrq = detailTable.get("bdkrq");
boolean mark = true;
for (Map<String,Object> date:dateList){
//存在考勤周期内
String startDate = Util.null2String(date.get("startDate"));
String endDate = Util.null2String(date.get("endDate"));
if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
mark = false;
}
}
if (mark){
//已关账
log.error("补打卡日期:{},已关账无法补打卡",bdkrq);
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("补打卡日期:"+bdkrq+"所在考勤周期已经关账无法再补打卡!");
return Action.FAILURE_AND_CONTINUE;
}
}
Map<String,List<Map<String, String>>> dataGroupByBdlxs = Maps.newHashMap();
//按照考勤周期对补打卡数据进行分类
for (int i=0;i<dateList.size();i++){
String startDate = Util.null2String(dateList.get(i).get("startDate"));
String endDate = Util.null2String(dateList.get(i).get("endDate"));
List<Map<String, String>> datas = Lists.newArrayList();
for (Map<String, String> detailTable:detailTableData){
String bdkrq = detailTable.get("bdkrq");
if (DateUtil.getTime(startDate).compareTo(DateUtil.getTime(bdkrq)) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(bdkrq)) >=0){
datas.add(detailTable);
}
}
if (datas.size() > 0){
dataGroupByBdlxs.put(startDate+","+endDate,datas);
}
}
log.info("dataGroupByBdlxs : [{}]",dataGroupByBdlxs);
/**
*
*/
for (Map.Entry<String,List<Map<String, String>>> detailentry :dataGroupByBdlxs.entrySet()){
List<Map<String, String>> details = detailentry.getValue();
String startDate = detailentry.getKey().split(",")[0];
String endDate = detailentry.getKey().split(",")[1];
Map<String,List<Map<String, String>>> dataGroupByBdlx = details.stream().collect(Collectors.groupingBy(e->e.get("bdklx")));
String bdklxs="";
for (Map.Entry<String,List<Map<String, String>>> entry :dataGroupByBdlx.entrySet()){
String bdklx = entry.getKey();
bdklxs = bdklxs + bdklx +",";
}
bdklxs = bdklxs.substring(0,bdklxs.length()-1);
String sql = "select id,kqzqnxzsycs,ygbcycb,xzsydcs,hbjrdkqxm from uf_jcl_kq_kqxm where id in ("+bdklxs+")";
List<Map<String,Object>> items = DbTools.getSqlToList(sql);
Map<String,List<Map<String, Object>>> itemsGroupById = items.stream().collect(Collectors.groupingBy(e->Util.null2String(e.get("id"))));
for (Map.Entry<String,List<Map<String, String>>> entry :dataGroupByBdlx.entrySet()){
String bdklx = entry.getKey();
//明细数据
List<Map<String, String>> detailDatas = entry.getValue();
//考勤项目
List<Map<String, Object>> item = itemsGroupById.get(bdklx);
int maxclockTimes = Integer.valueOf(item.get(0).get("xzsydcs").toString());
int clockTimes = detailDatas.size();
//计入限制次数的其他项目
String hbjrdkqxm = Util.null2String(item.get(0).get("hbjrdkqxm"));
//计入限制次数的其他项目的明细数据
List<Map<String, String>> list = dataGroupByBdlx.get(hbjrdkqxm);
if (list != null && list.size() > 0){
clockTimes += list.size();
}
sql = "select bdkry,dkrq from uf_jcl_kq_bdkjl where bdkry=? and bdklx=?";
List<Map<String,Object>> existsList = DbTools.getSqlToList(sql,userId,bdklx);
log.info("existsList : [{}]",existsList);
existsList = existsList.stream().filter(e->DateUtil.getTime(startDate).compareTo(DateUtil.getTime(e.get("dkrq").toString())) <=0 &&
DateUtil.getTime(endDate).compareTo(DateUtil.getTime(e.get("dkrq").toString())) >=0).collect(Collectors.toList());
clockTimes +=existsList.size();
log.info("clockTimes : [{}],maxclockTimes : [{}]",clockTimes,maxclockTimes);
if (clockTimes > maxclockTimes){
//已达到请假上限
log.error("考勤项目已达到补打卡上限");
requestInfo.getRequestManager().setMessageid("11111" + requestid + "22222");
requestInfo.getRequestManager().setMessagecontent("考勤项目已达到补打卡上限!");
return Action.FAILURE_AND_CONTINUE;
}
}
}
}catch (Exception e){
log.error("exception : [{}]",e);
}
return Action.SUCCESS;
}
}

@ -0,0 +1,108 @@
package com.engine.attendance.workflow.cmd;
import com.engine.common.biz.AbstractCommonCommand;
import com.engine.common.entity.BizLogContext;
import com.engine.common.util.CommonUtil;
import com.engine.common.util.DateUtil;
import com.engine.common.util.DbTools;
import com.engine.common.util.Utils;
import com.engine.core.interceptor.CommandContext;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.company.DepartmentComInfo;
import weaver.hrm.company.SubCompanyComInfo;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@Slf4j
public class GetKqCycleTimeIntervalCmd extends AbstractCommonCommand<Map<String, Object>> {
public GetKqCycleTimeIntervalCmd(Map<String, Object> params){
this.params = params;
}
@Override
public BizLogContext getLogContext() {
return null;
}
@Override
public Map<String, Object> execute(CommandContext commandContext) {
String userId = Util.null2String(params.get("userId"));
String submitDates = Util.null2String(params.get("submitDate"));
log.info("GetKqCycleTimeIntervalCmd userId:[{}],submitDates:[{}]",userId,submitDates);
String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_kqzqmc");
Set<String> attendanceSetIdsSets = CommonUtil.getDataIds(userId,modeId,null,null);
log.info("attendanceSetIdsSets : {}",attendanceSetIdsSets);
String sql = "select id,departmentid,subcompanyid1 from hrmresource where id =?";
Map<String,Object> departMentMap = DbTools.getSqlToMap(sql,userId);
String deptid = Util.null2String(departMentMap.get("departmentid"));
String pdeptids = "";
List<Map<String,Object>> dateList = Lists.newArrayList();
Map<String,Object> resultMap = Maps.newHashMap();
resultMap.put("status",true);
resultMap.put("data",dateList);
try {
pdeptids = new DepartmentComInfo().getAllParentDepartId(Util.null2String(departMentMap.get("departmentid")), pdeptids);
pdeptids = deptid + pdeptids;
log.info("pdeptids : [{}]",pdeptids);
LocalDateTime nowLocalDateTime = DateUtil.getTime(submitDates);
int nowyear = nowLocalDateTime.getYear();
int nowMonth = nowLocalDateTime.getMonth().getValue();
LocalDateTime beforeLocalDateTime = DateUtil.getTime(submitDates).minusMonths(1);
int beforeYear = beforeLocalDateTime.getYear();
int beforeMonth = beforeLocalDateTime.getMonth().getValue();
sql = "select a.zt,a.ksrq,a.jsrq,a.gzrq,a.gzsj,b.zt dtzt,b.tsbm,b.gzrq dtgzrq,b.gzsj dtgzsj from uf_jcl_kq_kqzq a left join uf_jcl_kq_kqzq_dt1 b on a.id=b.mainid where a.mc=? and (a.nd=? and a.yf=? or a.nd=? and a.yf=?)";
if (attendanceSetIdsSets.toArray().length == 0){
resultMap.put("status",false);
return resultMap;
}
List<Map<String,Object>> list = DbTools.getSqlToList(sql,attendanceSetIdsSets.toArray()[0],nowyear,nowMonth,beforeYear,beforeMonth);
log.info("GetKqCycleTimeIntervalCmd list : [{}]",list);
for (Map<String,Object> dataMap : list){
String tsbm = Util.null2String(dataMap.get("tsbm"));
if (!"".equals(tsbm) && CommonUtil.ifContainStr(pdeptids,tsbm,",")){
//人员在特殊部门里
String gzrq = Util.null2String(dataMap.get("dtgzrq")) +" "+Util.null2String(dataMap.get("dtgzsj")) +":00";
if (DateUtil.getTime(submitDates).compareTo(DateUtil.getTime(gzrq))<=0){
Map<String,Object> date = Maps.newHashMap();
date.put("startDate",dataMap.get("ksrq"));
date.put("endDate",dataMap.get("jsrq"));
dateList.add(date);
}
}
}
for (Map<String,Object> dataMap : list){
String gzrq = Util.null2String(dataMap.get("gzrq")) +" "+Util.null2String(dataMap.get("gzsj")) +":00";
if (DateUtil.getTime(submitDates).compareTo(DateUtil.getTime(gzrq))<=0){
Map<String,Object> date = Maps.newHashMap();
List<Map<String,Object>> filterDate = dateList.stream().filter(e->e.get("startDate").equals(dataMap.get("ksrq"))).collect(Collectors.toList());
if (filterDate.size() == 0){
date.put("startDate",dataMap.get("ksrq"));
date.put("endDate",dataMap.get("jsrq"));
dateList.add(date);
}
}
}
}catch (Exception e){
log.error("catch error :{}",e);
}
log.info("GetKqCycleTimeIntervalCmd dateList : [{}]",dateList);
return resultMap;
}
}

@ -4,4 +4,6 @@ import java.util.Map;
public interface MakeUpClockInService { public interface MakeUpClockInService {
Map<String,Object> processSubmitCheck(Map<String,Object> params); Map<String,Object> processSubmitCheck(Map<String,Object> params);
Map<String,Object> getKqCycleTimeIntervalCmd(Map<String,Object> params);
} }

@ -34,11 +34,12 @@ public class BusinessTripsApplyServiceImpl extends Service implements BusinessTr
sql += " and cclx = " + businessTripsType; sql += " and cclx = " + businessTripsType;
} }
if (!startDate.equals("")) { if (!startDate.equals("")) {
sql += " and ksrq >= " + startDate; sql += " and ksrq >= '" + startDate+"'";
} }
if (!endDate.equals("")) { if (!endDate.equals("")) {
sql += " and jsrq <= " + endDate; sql += " and jsrq <= '" + endDate+"'";
} }
log.info(sql);
List<String> maidList = new ArrayList<>(); List<String> maidList = new ArrayList<>();
if (!targetUserId.equals("")) { if (!targetUserId.equals("")) {
List<Map<String,Object>> datas = DbTools.getSqlToList(sql); List<Map<String,Object>> datas = DbTools.getSqlToList(sql);

@ -1,5 +1,7 @@
package com.engine.attendance.workflow.service.impl; package com.engine.attendance.workflow.service.impl;
import com.engine.attendance.component.persongroup.cmd.GetDatatableCountCmd;
import com.engine.attendance.workflow.cmd.GetKqCycleTimeIntervalCmd;
import com.engine.attendance.workflow.service.MakeUpClockInService; import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.core.impl.Service; import com.engine.core.impl.Service;
@ -12,4 +14,10 @@ public class MakeUpClockInServiceImpl extends Service implements MakeUpClockInSe
return null; return null;
} }
@Override
public Map<String, Object> getKqCycleTimeIntervalCmd(Map<String, Object> params) {
return commandExecutor.execute(new GetKqCycleTimeIntervalCmd(params));
}
} }

@ -21,7 +21,7 @@ public class ProcessSubmitCheckServiceImpl extends Service implements ProcessSub
@Override @Override
public Map<String, Object> processSubmitCheck(Map<String, Object> params) { public Map<String, Object> processSubmitCheck(Map<String, Object> params) {
String userId = Util.null2String(params.get("userId")); String userId = Util.null2String(params.get("userId"));
String submitDate = Util.null2String(params.get("submitDate")); String submitDates = Util.null2String(params.get("submitDate"));
//String modeId = Util.null2String(params.get("modeId")); //String modeId = Util.null2String(params.get("modeId"));
String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_kqzqmc"); String modeId = Utils.getFormmodeIdMap().get("uf_jcl_kq_kqzqmc");
Map<String,Object> resultMap = Maps.newHashMap(); Map<String,Object> resultMap = Maps.newHashMap();
@ -29,7 +29,7 @@ public class ProcessSubmitCheckServiceImpl extends Service implements ProcessSub
Set<String> attendanceSetIdsSets = CommonUtil.getDataIds(userId,modeId,null,null); Set<String> attendanceSetIdsSets = CommonUtil.getDataIds(userId,modeId,null,null);
log.info("attendanceSetIdsSets : {}",attendanceSetIdsSets); log.info("attendanceSetIdsSets : {}",attendanceSetIdsSets);
for (String submitDate:submitDates.split(",")){
LocalDateTime localDateTime = DateUtil.getTime(submitDate); LocalDateTime localDateTime = DateUtil.getTime(submitDate);
int year = localDateTime.getYear(); int year = localDateTime.getYear();
int month = localDateTime.getMonth().getValue(); int month = localDateTime.getMonth().getValue();
@ -41,48 +41,55 @@ public class ProcessSubmitCheckServiceImpl extends Service implements ProcessSub
pdeptids = new DepartmentComInfo().getAllParentDepartId(Util.null2String(departMentMap.get("departmentid")), pdeptids); pdeptids = new DepartmentComInfo().getAllParentDepartId(Util.null2String(departMentMap.get("departmentid")), pdeptids);
pdeptids = deptid + pdeptids; pdeptids = deptid + pdeptids;
log.info("pdeptids : [{}]",pdeptids); log.info("pdeptids : [{}]",pdeptids);
sql = "select a.zt,a.gzrq,a.gzsj,b.zt dtzt,b.tsbm,b.gzrq dtgzrq,b.gzsj dtgzsj from uf_jcl_kq_kqzq a left join uf_jcl_kq_kqzq_dt1 b on a.id=b.mainid where a.nd=? and a.mc=? and a.yf=?"; sql = "select a.zt,a.ksrq,a.gzrq,a.gzsj,b.zt dtzt,b.tsbm,b.gzrq dtgzrq,b.gzsj dtgzsj from uf_jcl_kq_kqzq a left join uf_jcl_kq_kqzq_dt1 b on a.id=b.mainid where a.nd=? and a.mc=? and a.yf=?";
if (attendanceSetIdsSets.toArray().length > 0){ if (attendanceSetIdsSets.toArray().length > 0){
List<Map<String,Object>> list = DbTools.getSqlToList(sql,year,attendanceSetIdsSets.toArray()[0],month); List<Map<String,Object>> list = DbTools.getSqlToList(sql,year,attendanceSetIdsSets.toArray()[0],month);
for (Map<String,Object> dataMap : list){ for (Map<String,Object> dataMap : list){
//先看人员是否在此笔考勤周期的明细中如果在看明细记录上的开关账状态如果状态为关账直接返回false否则看明细记录上的关账日期时间是否小于当前日期时间如果小于返回false; //先看人员是否在此笔考勤周期的明细中如果在看明细记录上的开关账状态如果状态为关账直接返回false否则看明细记录上的关账日期时间是否小于当前日期时间如果小于返回false;
String tsbm = Util.null2String(dataMap.get("tsbm")); String tsbm = Util.null2String(dataMap.get("tsbm"));
String dtzt = Util.null2String(dataMap.get("dtzt")); String dtzt = Util.null2String(dataMap.get("dtzt"));
resultMap.put("openDate",dataMap.get("ksrq"));
if (!"".equals(tsbm) && CommonUtil.ifContainStr(pdeptids,tsbm,",")){ if (!"".equals(tsbm) && CommonUtil.ifContainStr(pdeptids,tsbm,",")){
//明细表有值 //明细表有值
String gzrq = Util.null2String(dataMap.get("dtgzrq")) +" "+Util.null2String(dataMap.get("dtgzsj")) +":00";
resultMap.put("closeDate",gzrq);
if (dtzt.equals("1")){ if (dtzt.equals("1")){
//关账 //关账
resultMap.put("result","1"); resultMap.put("result","1");
resultMap.put("submitDate",submitDate);
}else { }else {
String gzrq = Util.null2String(dataMap.get("dtgzrq")) +" "+Util.null2String(dataMap.get("dtgzsj")) +":00";
if (DateUtil.getBetWeenMinutes(gzrq,submitDate,DateUtil.yyyyMMddHHmm) >0){ if (DateUtil.getBetWeenMinutes(gzrq,submitDate,DateUtil.yyyyMMddHHmm) >0){
resultMap.put("result","1"); resultMap.put("result","1");
resultMap.put("submitDate",submitDate);
} }
} }
} }
} }
if ("0".equals(resultMap.get("result"))){ //不在特殊部门中时
if (resultMap.get("closeDate") == null){
for (Map<String,Object> dataMap : list){ for (Map<String,Object> dataMap : list){
//先看人员是否在此笔考勤周期的明细中如果在看明细记录上的开关账状态如果状态为关账直接返回false否则看明细记录上的关账日期时间是否小于当前日期时间如果小于返回false;
String zt = Util.null2String(dataMap.get("zt")); String zt = Util.null2String(dataMap.get("zt"));
String gzrq = Util.null2String(dataMap.get("gzrq")) +" "+Util.null2String(dataMap.get("gzsj")) +":00"; String gzrq = Util.null2String(dataMap.get("gzrq")) +" "+Util.null2String(dataMap.get("gzsj")) +":00";
resultMap.put("closeDate",gzrq);
if (zt.equals("1")){ if (zt.equals("1")){
//关账 //关账
resultMap.put("result","1"); resultMap.put("result","1");
resultMap.put("submitDate",submitDate);
}else { }else {
if (DateUtil.getBetWeenMinutes(gzrq,submitDate,DateUtil.yyyyMMddHHmm) >0){ if (DateUtil.getBetWeenMinutes(gzrq,submitDate,DateUtil.yyyyMMddHHmm) >0){
resultMap.put("result","1"); resultMap.put("result","1");
resultMap.put("submitDate",submitDate);
} }
} }
} }
} }
} }
}catch (Exception e){ }catch (Exception e){
log.error("catch error :{}",e); log.error("catch error :{}",e);
} }
}
return resultMap; return resultMap;
} }

@ -1,9 +1,7 @@
package com.engine.attendance.workflow.web; package com.engine.attendance.workflow.web;
import com.engine.attendance.workflow.service.MakeUpClockInService; import com.engine.attendance.workflow.service.MakeUpClockInService;
import com.engine.attendance.workflow.service.ProcessSubmitCheckService;
import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl; import com.engine.attendance.workflow.service.impl.MakeUpClockInServiceImpl;
import com.engine.attendance.workflow.service.impl.ProcessSubmitCheckServiceImpl;
import com.engine.common.util.ApiReturnTools; import com.engine.common.util.ApiReturnTools;
import com.engine.common.util.ParamUtil; import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil; import com.engine.common.util.ServiceUtil;
@ -26,7 +24,7 @@ public class MakeUpClockInAction {
private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class); private MakeUpClockInService makeUpClockInService = ServiceUtil.getService(MakeUpClockInServiceImpl.class);
/** /**
* *
* @return * @return
*/ */
@POST @POST

@ -5,10 +5,9 @@ import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import weaver.general.Util; import weaver.general.Util;
import weaver.hrm.company.DepartmentComInfo; import weaver.hrm.company.DepartmentComInfo;
import weaver.soa.workflow.request.*;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Slf4j @Slf4j
@ -135,10 +134,55 @@ public class CommonUtil {
} }
public static boolean ifContainStr(String fatherStr,String sonStr,String mark){ public static boolean ifContainStr(String fatherStr,String sonStr,String mark){
for (String pdeptid : fatherStr.split(mark)){ for (String pdeptid : fatherStr.split(mark)){
if (pdeptid.equals(mark)){ if (pdeptid.equals(sonStr)){
return true; return true;
} }
} }
return false; return false;
} }
/**
* requestInfomap
* @param requestInfo
* @return
*/
public static HashMap<String,String> getMainTableInfo(RequestInfo requestInfo){
HashMap<String,String> mainMap = new HashMap<String,String>();
Property[] properties = requestInfo.getMainTableInfo().getProperty();// 获取表单主字段信息
for (int i = 0; i < properties.length; i++) {
String name = properties[i].getName();// 主字段名称
String value = Util.null2String(properties[i].getValue());// 主字段对应的值
mainMap.put(name, value);
}
return mainMap;
}
/**
*
* @param request
* @return
*/
public static List<Map<String, String>> getDetailTableInfo(RequestInfo request, int index) {
// 获取明细的信息
List<Map<String, String>> list = new ArrayList<Map<String, String>>();
DetailTable[] detailtables = request.getDetailTableInfo().getDetailTable();// 获取明细表数据
if (detailtables.length > index) {
DetailTable dt = detailtables[index];// 获取明细表 0代表明细表1
Row[] rows = dt.getRow();// 获取明细表中所有行的信息
for (int i = 0; i < rows.length; i++) {
Row row = rows[i];// 获取具体行信息
Cell[] cells = row.getCell();// 获取具体行所有列的信息
Map<String, String> map = new HashMap<String, String>();
for (int j = 0; j < cells.length; j++) {
Cell cell = cells[j];
String name = cell.getName().toLowerCase();// 获取字段名
String value = cell.getValue();// 获取具体的值
map.put(name, value);
}
list.add(map);
}
}
return list;
}
} }

@ -18,6 +18,9 @@ public class DateUtil {
LocalDateTime localDateTime = DateUtil.getTime(time); LocalDateTime localDateTime = DateUtil.getTime(time);
return localDateTime.minusMonths(month).format(yyyyMMdd); return localDateTime.minusMonths(month).format(yyyyMMdd);
} }
public static String lastMonth(String time){ public static String lastMonth(String time){
LocalDateTime localDateTime = DateUtil.getTime(time); LocalDateTime localDateTime = DateUtil.getTime(time);

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save