From 8251489d62218d25b99f4efac215c28f548a0f54 Mon Sep 17 00:00:00 2001 From: liuliang <401809302@qq.com> Date: Tue, 23 Jan 2024 20:11:33 +0800 Subject: [PATCH] liuliang --- .idea/workspace.xml | 159 +- log/sdk.log | 1868 ----------------- .../hrm_attendance/hrm-attendance.jar | Bin 256333 -> 283024 bytes .../WorkRulesControllerApi.java | 15 + .../persongroup/PersonGroupActionApi.java | 2 +- .../SchedulingResultsActionApi.java | 2 +- .../cmd/GetClockInPointCmd.java | 11 +- .../cmd/GetClockInTimeItemCmd.java | 1 + ...{recordDataCmd.java => RecordDataCmd.java} | 11 +- .../cmd/UpdateAttendanceResultsCmd.java | 16 +- .../cmd/item/ForGetClockItemCmd.java | 54 + .../service/ForgetClockInService.java | 2 +- .../impl/ForgetClockInServiceImpl.java | 40 +- .../service/impl/UtilServiceImpl.java | 22 +- .../web/AttendanceanalysisAction.java | 93 +- .../wrapper/AttendanceAnalysisWrapper.java | 23 +- .../GetAttendanceItemsByPersonDataCmd.java | 4 +- src/com/engine/attendance/component/README.md | 2 +- .../service/WorkRulesService.java | 33 + .../service/impl/WorkRulesServiceImpl.java | 373 ++++ .../web/WorkRulesController.java | 61 + .../persongroup/cmd/GetDatatableCmd.java | 4 +- .../persongroup/cmd/GetDatatableCountCmd.java | 2 +- .../cmd/GetDatatableRecurrenceCmd.java | 18 +- .../commonutil/PersongroupCommonUtil.java | 46 +- .../job/scheduling/SchedulingJob.java | 11 +- .../tactics/DayRegularScheduling.java | 5 +- .../tactics/MonthRegularScheduling.java | 12 +- .../tactics/WeekRegularScheduling.java | 10 +- .../tactics/YearRegularScheduling.java | 11 +- .../enums/PersonGroupListTypeEnum.java | 30 + .../enums/RegularScheduleTypeEnum.java | 34 + src/com/engine/attendance/vacation/README.md | 3 + src/com/engine/common/cmd/GetDateCmd.java | 8 +- .../exception/AttendanceRunTimeException.java | 15 + .../exception/SalaryRunTimeException.java | 15 - src/com/engine/common/util/ExceptionUtil.java | 20 + .../engine/common/util/ResponseResult.java | 42 +- src/com/engine/common/util/Utils.java | 24 + .../WorkRulesControllerApi.class | Bin 0 -> 562 bytes .../persongroup/PersonGroupActionApi.class | Bin 0 -> 710 bytes .../SchedulingResultsActionApi.class | Bin 0 -> 740 bytes .../persongroup/PersonGroupActionApi.class | Bin 690 -> 0 bytes .../SchedulingResultsActionApi.class | Bin 720 -> 0 bytes .../cmd/GetClockInPointCmd.class | Bin 24056 -> 24546 bytes .../cmd/GetClockInTimeItemCmd.class | Bin 14706 -> 14712 bytes .../cmd/UpdateAttendanceResultsCmd.class | Bin 7786 -> 7871 bytes .../cmd/item/ForGetClockItemCmd.class | Bin 0 -> 3963 bytes .../cmd/recordDataCmd.class | Bin 8226 -> 8446 bytes .../service/ForgetClockInService.class | Bin 515 -> 418 bytes .../impl/AbnormalAttendanceServiceImpl.class | Bin 15005 -> 15168 bytes .../impl/ForgetClockInServiceImpl.class | Bin 2356 -> 3343 bytes .../service/impl/UtilServiceImpl.class | Bin 15366 -> 15515 bytes .../impl/WorkOverTimeServiceImpl.class | Bin 22646 -> 22795 bytes .../web/AttendanceanalysisAction.class | Bin 12701 -> 14093 bytes .../wrapper/AttendanceAnalysisWrapper$1.class | Bin 1940 -> 1940 bytes .../wrapper/AttendanceAnalysisWrapper$2.class | Bin 1930 -> 1930 bytes .../wrapper/AttendanceAnalysisWrapper.class | Bin 16301 -> 16145 bytes .../GetAttendanceItemsByPersonDataCmd.class | Bin 8489 -> 8489 bytes .../service/WorkRulesService.class | Bin 0 -> 550 bytes .../service/impl/WorkRulesServiceImpl$1.class | Bin 0 -> 1363 bytes .../service/impl/WorkRulesServiceImpl$2.class | Bin 0 -> 1363 bytes .../service/impl/WorkRulesServiceImpl$3.class | Bin 0 -> 1363 bytes .../service/impl/WorkRulesServiceImpl$4.class | Bin 0 -> 1192 bytes .../service/impl/WorkRulesServiceImpl$5.class | Bin 0 -> 1192 bytes .../service/impl/WorkRulesServiceImpl$6.class | Bin 0 -> 1195 bytes .../service/impl/WorkRulesServiceImpl$7.class | Bin 0 -> 1195 bytes .../service/impl/WorkRulesServiceImpl.class | Bin 0 -> 18695 bytes .../web/WorkRulesController.class | Bin 0 -> 3629 bytes .../persongroup/cmd/GetDatatableCmd.class | Bin 5410 -> 5427 bytes .../cmd/GetDatatableCountCmd.class | Bin 3515 -> 3511 bytes .../cmd/GetDatatableRecurrenceCmd.class | Bin 7328 -> 7395 bytes .../commonutil/PersongroupCommonUtil.class | Bin 14419 -> 16036 bytes .../job/scheduling/SchedulingJob.class | Bin 4034 -> 4138 bytes .../tactics/DayRegularScheduling.class | Bin 7509 -> 7568 bytes .../tactics/MonthRegularScheduling.class | Bin 7564 -> 7543 bytes .../tactics/WeekRegularScheduling.class | Bin 7949 -> 8026 bytes .../tactics/YearRegularScheduling.class | Bin 7988 -> 7940 bytes .../enums/ClassSegmentTypeEnum.class | Bin 2246 -> 2341 bytes .../enums/PersonGroupListTypeEnum.class | Bin 0 -> 1632 bytes .../enums/RegularScheduleTypeEnum.class | Bin 0 -> 1966 bytes .../attendance/enums/WorkForTimeEnum.class | Bin 2041 -> 2136 bytes .../tactics/OneTimePayMentWay.class | Bin 8440 -> 8509 bytes .../com/engine/common/cmd/GetDateCmd.class | Bin 2207 -> 2590 bytes .../AttendanceRunTimeException.class | Bin 0 -> 720 bytes .../exception/SalaryRunTimeException.class | Bin 708 -> 0 bytes .../engine/common/util/ExceptionUtil.class | Bin 0 -> 684 bytes .../engine/common/util/ResponseResult.class | Bin 6319 -> 6458 bytes .../com/engine/common/util/Utils$1.class | Bin 535 -> 535 bytes .../com/engine/common/util/Utils$2.class | Bin 517 -> 517 bytes .../com/engine/common/util/Utils$3.class | Bin 908 -> 908 bytes .../com/engine/common/util/Utils.class | Bin 19874 -> 22285 bytes .../test-classes/TestGetClockInPoint$5.class | Bin 633 -> 0 bytes .../test-classes/TestGetClockInPoint$6.class | Bin 633 -> 0 bytes target/test-classes/TestGetClockInPoint.class | Bin 14063 -> 13947 bytes target/test-classes/TestObj$1.class | Bin 470 -> 470 bytes target/test-classes/TestObj$2.class | Bin 471 -> 471 bytes target/test-classes/TestObj$3.class | Bin 471 -> 471 bytes target/test-classes/TestObj.class | Bin 2792 -> 2932 bytes .../calendarscheduling/Testmain$1.class | Bin 0 -> 677 bytes .../calendarscheduling/Testmain$2.class | Bin 0 -> 677 bytes .../calendarscheduling/Testmain$3.class | Bin 0 -> 654 bytes .../calendarscheduling/Testmain$4.class | Bin 0 -> 654 bytes .../calendarscheduling/Testmain$5.class | Bin 0 -> 654 bytes .../calendarscheduling/Testmain.class | Bin 0 -> 2197 bytes test/TestGetClockInPoint.java | 24 +- test/TestObj.java | 3 + test/calendarscheduling/Testmain.java | 72 + 108 files changed, 1116 insertions(+), 2085 deletions(-) delete mode 100644 log/sdk.log create mode 100644 src/com/api/attendance/component/calendarscheduling/WorkRulesControllerApi.java rename src/com/api/attendance/{ => component}/persongroup/PersonGroupActionApi.java (82%) rename src/com/api/attendance/{ => component}/persongroup/SchedulingResultsActionApi.java (84%) rename src/com/engine/attendance/attendanceanalysis/cmd/{recordDataCmd.java => RecordDataCmd.java} (94%) create mode 100644 src/com/engine/attendance/attendanceanalysis/cmd/item/ForGetClockItemCmd.java create mode 100644 src/com/engine/attendance/component/calendarscheduling/service/WorkRulesService.java create mode 100644 src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java create mode 100644 src/com/engine/attendance/component/calendarscheduling/web/WorkRulesController.java create mode 100644 src/com/engine/attendance/enums/PersonGroupListTypeEnum.java create mode 100644 src/com/engine/attendance/enums/RegularScheduleTypeEnum.java create mode 100644 src/com/engine/attendance/vacation/README.md create mode 100644 src/com/engine/common/exception/AttendanceRunTimeException.java delete mode 100644 src/com/engine/common/exception/SalaryRunTimeException.java create mode 100644 src/com/engine/common/util/ExceptionUtil.java create mode 100644 target/classes/com/api/attendance/component/calendarscheduling/WorkRulesControllerApi.class create mode 100644 target/classes/com/api/attendance/component/persongroup/PersonGroupActionApi.class create mode 100644 target/classes/com/api/attendance/component/persongroup/SchedulingResultsActionApi.class delete mode 100644 target/classes/com/api/attendance/persongroup/PersonGroupActionApi.class delete mode 100644 target/classes/com/api/attendance/persongroup/SchedulingResultsActionApi.class create mode 100644 target/classes/com/engine/attendance/attendanceanalysis/cmd/item/ForGetClockItemCmd.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/WorkRulesService.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$1.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$2.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$3.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$4.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$5.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$6.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$7.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class create mode 100644 target/classes/com/engine/attendance/component/calendarscheduling/web/WorkRulesController.class create mode 100644 target/classes/com/engine/attendance/enums/PersonGroupListTypeEnum.class create mode 100644 target/classes/com/engine/attendance/enums/RegularScheduleTypeEnum.class create mode 100644 target/classes/com/engine/common/exception/AttendanceRunTimeException.class delete mode 100644 target/classes/com/engine/common/exception/SalaryRunTimeException.class create mode 100644 target/classes/com/engine/common/util/ExceptionUtil.class delete mode 100644 target/test-classes/TestGetClockInPoint$5.class delete mode 100644 target/test-classes/TestGetClockInPoint$6.class create mode 100644 target/test-classes/calendarscheduling/Testmain$1.class create mode 100644 target/test-classes/calendarscheduling/Testmain$2.class create mode 100644 target/test-classes/calendarscheduling/Testmain$3.class create mode 100644 target/test-classes/calendarscheduling/Testmain$4.class create mode 100644 target/test-classes/calendarscheduling/Testmain$5.class create mode 100644 target/test-classes/calendarscheduling/Testmain.class create mode 100644 test/calendarscheduling/Testmain.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 17864a3..570db7e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,42 +10,89 @@ - + + + + + + + + + + - + + + - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - + - @@ -86,7 +133,7 @@ - + @@ -95,21 +142,21 @@ + + + - - - + - - + - - + + + + - - @@ -401,6 +454,17 @@ + + + + + + + + + + + @@ -443,11 +507,6 @@ 301