diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d067de1..541ff65 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,64 +10,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -109,7 +60,7 @@
-
+
@@ -133,22 +84,21 @@
-
+
-
-
-
+
+
-
-
+
+
@@ -171,10 +121,10 @@
@@ -418,7 +368,9 @@
-
+
+
+
@@ -466,16 +418,6 @@
90
-
- file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java
- 294
-
-
-
- file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java
- 279
-
-
diff --git a/log/sdk.log b/log/sdk.log
index 2c2aa40..e8419e0 100644
--- a/log/sdk.log
+++ b/log/sdk.log
@@ -1559,3 +1559,110 @@
2024-01-08 20:43:41,011 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-12-01 00:00:00, lyid=18, ktsc=2.5, jzrq=2021-12-31}]
2024-01-08 20:43:54,392 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
2024-01-08 20:44:44,333 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-12-01 00:00:00, lyid=18, ktsc=2.5, jzrq=2021-12-31}]
+2024-01-09 10:01:47,396 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:01:47,401 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-29 00:00:00, lyid=18, jzrq=2023-12-31}]
+2024-01-09 10:02:31,883 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:03:12,813 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:03:12,821 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-29 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-12-31}]
+2024-01-09 10:09:08,814 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:10:27,567 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-29 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-12-31}]
+2024-01-09 10:10:50,614 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:12:23,260 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-29 00:00:00, lyid=18, ktsc=11.0, jzrq=2023-12-31}]
+2024-01-09 10:13:14,794 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:13:37,375 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-29 00:00:00, lyid=18, ktsc=11.0, jzrq=2023-12-31}]
+2024-01-09 10:13:44,079 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:14:09,460 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-29 00:00:00, lyid=18, ktsc=11.0, jzrq=2023-12-31}]
+2024-01-09 10:24:17,127 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:25:17,312 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-29 00:00:00, lyid=18, ktsc=1.0, jzrq=2023-12-31}]
+2024-01-09 10:26:19,463 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:26:23,133 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-29 00:00:00, lyid=18, ktsc=1.0, jzrq=2023-12-31}]
+2024-01-09 10:30:41,495 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:30:54,123 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:32:02,913 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:32:02,924 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-07-28, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 10:32:14,095 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:42:25,603 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-07-28, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 10:42:40,336 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:42:57,516 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=2.0, jzrq=2021-12-31}]
+2024-01-09 10:43:01,656 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:44:25,698 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=2.0, jzrq=2021-12-31}]
+2024-01-09 10:47:00,093 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:47:23,436 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=2.0, jzrq=2021-12-31}]
+2024-01-09 10:47:27,938 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:47:55,946 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=2.0, jzrq=2021-12-31}]
+2024-01-09 10:48:22,881 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:48:44,711 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=2.0, jzrq=2021-12-31}]
+2024-01-09 10:48:56,126 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:49:03,869 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=2.0, jzrq=2021-12-31}]
+2024-01-09 10:50:11,886 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:50:18,434 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-07-28 00:00:00, lyid=18, ktsc=2.0, jzrq=2021-12-31}]
+2024-01-09 10:56:35,308 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:56:35,320 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-12-30, jqid=112, qsrq=2021-06-01, ffsj=2021-12-30 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 10:56:48,458 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:56:51,334 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-12-30, jqid=112, qsrq=2021-06-01, ffsj=2021-12-30 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 10:56:56,288 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:57:53,971 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-12-30, jqid=112, qsrq=2021-06-01, ffsj=2021-12-30 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 10:58:06,144 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:58:06,156 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-07-01, jqid=112, qsrq=2021-06-01, ffsj=2021-07-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 10:58:21,873 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:58:21,885 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-08-01, jqid=112, qsrq=2021-06-01, ffsj=2021-08-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 10:58:36,486 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:58:36,497 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-08-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 10:58:46,620 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:59:01,521 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-08-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 10:59:05,205 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:59:14,871 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-08-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 10:59:34,513 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 10:59:52,254 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-08-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 10:59:58,948 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:00:21,386 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-08-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 11:00:53,133 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:00:54,817 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2022-08-01 00:00:00, lyid=18, ktsc=2.0, jzrq=2023-05-31}]
+2024-01-09 11:01:14,545 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:01:14,556 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2022-07-01 00:00:00, lyid=18, ktsc=1.0, jzrq=2023-05-31}]
+2024-01-09 11:01:31,292 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:01:31,301 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2022-09-01 00:00:00, lyid=18, ktsc=3.0, jzrq=2023-05-31}]
+2024-01-09 11:01:51,212 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:01:51,234 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2022-12-01 00:00:00, lyid=18, ktsc=6.0, jzrq=2023-05-31}]
+2024-01-09 11:02:11,525 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:02:11,535 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-01 00:00:00, lyid=18, ktsc=7.0, jzrq=2023-05-31}]
+2024-01-09 11:02:24,826 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:02:25,631 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-01 00:00:00, lyid=18, ktsc=7.0, jzrq=2023-05-31}]
+2024-01-09 11:02:29,503 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:02:29,515 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-01 00:00:00, lyid=18, ktsc=7.0, jzrq=2023-05-31}]
+2024-01-09 11:02:39,212 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:02:41,217 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-01 00:00:00, lyid=18, ktsc=7.0, jzrq=2023-05-31}]
+2024-01-09 11:02:48,387 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:03:09,440 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-01 00:00:00, lyid=18, ktsc=7.0, jzrq=2023-05-31}]
+2024-01-09 11:03:50,190 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:03:52,883 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2023-01-01 00:00:00, lyid=18, ktsc=1.0, jzrq=2023-12-31}]
+2024-01-09 11:04:08,237 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:04:08,248 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-07-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 11:04:18,191 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:04:18,202 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-07-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 11:04:29,587 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:04:29,599 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-08-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 11:04:40,953 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:05:26,499 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-07-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 11:06:05,440 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:06:05,455 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-07-01 00:00:00, lyid=18, ktsc=1.0, jzrq=2022-12-31}]
+2024-01-09 11:06:16,639 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:06:16,655 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-08-01 00:00:00, lyid=18, ktsc=2.0, jzrq=2022-12-31}]
+2024-01-09 11:06:30,308 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:06:30,319 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-10-01 00:00:00, lyid=18, ktsc=4.0, jzrq=2022-12-31}]
+2024-01-09 11:06:42,197 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:06:42,208 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-12-01 00:00:00, lyid=18, ktsc=6.0, jzrq=2022-12-31}]
+2024-01-09 11:06:54,857 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:06:54,869 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-01-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 11:08:36,520 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:08:36,532 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2021-06-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 11:08:44,052 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:08:59,630 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2021-06-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 11:09:02,651 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:09:30,449 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2021-06-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 11:09:43,231 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:10:06,508 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2021-06-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 11:10:23,177 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:10:43,286 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-06-01 00:00:00, lyid=18, ktsc=1.0, jzrq=2021-12-31}]
+2024-01-09 11:11:02,359 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 11:11:48,938 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2021-06-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
diff --git a/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java b/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java
index b3d35b5..5584556 100644
--- a/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java
+++ b/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java
@@ -1,5 +1,14 @@
package com.engine.attendance.vacation.job.holidaygeneration.tactics;
+import com.engine.attendance.enums.CheckBoxEnum;
+import com.engine.attendance.enums.QuotaChangeMethodEnum;
+import com.engine.attendance.enums.StartingUnitEnum;
+import com.engine.attendance.vacation.util.VocationCommonUtil;
+import com.engine.common.util.DateUtil;
+import weaver.general.Util;
+
+import java.util.Calendar;
+import java.util.List;
import java.util.Map;
/**
@@ -16,6 +25,245 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
@Override
public void compute(Map data) {
+ String userId = Util.null2String(data.get("userId"));
+ String releaseDate = Util.null2String(data.get("releaseDate"));
+ String cover = Util.null2String(data.get("cover"));
+ if ("".equals(releaseDate)) {
+ releaseDate = DateUtil.getCurrentTime();
+ }
+ List> vocationList = (List>) data.get("vocationList");
+ //起算日期
+ String qsrq = Util.null2String(vocationList.get(0).get("qsrq"));
+ //额度有效期间
+ String edyxqsz = Util.null2String(vocationList.get(0).get("edyxqsz"));
+ //额度有效期间单位
+ String edyxq = Util.null2String(vocationList.get(0).get("edyxq"));
+ //累计承认工龄月份数栏位值
+ String ljcrglyfslwz = Util.null2String(vocationList.get(0).get("ljcrglyfslwz"));
+ //依据字段
+ String yjzd = Util.null2String(vocationList.get(0).get("yjzd"));
+ //调整起算日期策略
+ String dzqsrq = Util.null2String(vocationList.get(0).get("dzqsrq"));
+ //分割日期
+ String fgrq = Util.null2String(vocationList.get(0).get("fgrq"));
+ //提前执行发放操作的天数
+ String dqtqffts = Util.null2String(vocationList.get(0).get("dqtqffts"));
+ //执行发放的时间点
+ String ffdtffsj = Util.null2String(vocationList.get(0).get("ffdtffsj"));
+ //入职当期额度按比例折算
+ String rzdqedablzs = Util.null2String(vocationList.get(0).get("rzdqedablzs"));
+ //首次获得额度按比例折算
+ String schdedablzs = Util.null2String(vocationList.get(0).get("schdedablzs"));
+ //额度变更时额度处理方式
+ String edbgsedclfs = Util.null2String(vocationList.get(0).get("edbgsedclfs"));
+ //额度单位
+ String eddw = Util.null2String(vocationList.get(0).get("edbgsedclfs"));
+ //尾数处理
+ String wscl = Util.null2String(vocationList.get(0).get("wscl"));
+ //首次获得额度控制生效日期
+ String schdedkzsxrq = Util.null2String(vocationList.get(0).get("schdedkzsxrq"));
+
+ qsrq = VocationCommonUtil.getAfterAdjustTime(qsrq, dzqsrq, fgrq);
+ for (Map vocationMap : vocationList) {
+ vocationMap.put("qsrq", qsrq);
+ }
+
+ if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(qsrq)) < 0){
+ releaseDate=qsrq;
+ }
+
+ //相差天数
+ int betweenDays = DateUtil.getBetWeenDays(qsrq, releaseDate.split(" ")[0]);
+ //相差月份
+ int betweenMonth = DateUtil.getBetWeenMonths(qsrq, releaseDate.split(" ")[0]);
+ //总工龄天数
+ int allWorkDays = Double.valueOf(ljcrglyfslwz).intValue() * 30 + betweenDays;
+ //总月数
+ int allMonths = betweenMonth + Double.valueOf(ljcrglyfslwz).intValue();
+
+ Map insertHoliDayParam = VocationCommonUtil.getInsertHoliDayParam(vocationList.get(0), userId, qsrq, releaseDate);
+
+ List> dataList = VocationCommonUtil.ifexist("uf_jcl_kq_jqye", insertHoliDayParam);
+
+ String sxrq = insertHoliDayParam.get("sxrq").toString();
+ //实际休息时长
+ double restTime = 0;
+
+ //工龄小于1年的新员工,且额度有效期单位为自然年
+ if (allMonths < 12 && edyxq.equals(StartingUnitEnum.NATURAL_YEAR.getKey())) {
+ if (QuotaChangeMethodEnum.CONVERT.getKey().equals(edbgsedclfs) || CheckBoxEnum.CHECKED.getKey().equals(schdedablzs)) {
+ restTime = getRestTime(insertHoliDayParam,vocationList,QuotaChangeMethodEnum.CONVERT,releaseDate);
+ }else {
+ restTime = getRestTime(insertHoliDayParam,vocationList,QuotaChangeMethodEnum.NO_CONVERT,releaseDate);
+ }
+ if (CheckBoxEnum.CHECKED.getKey().equals(schdedkzsxrq)) {
+ int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue();
+ String divideTime = DateUtil.beforeMonth(qsrq,seniority);
+ divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
+ insertHoliDayParam.put("sxrq", divideTime);
+ }
+ insertHoliDayParam.put("ktsc", restTime);
+ }else if (allMonths >= 12 && edyxq.equals(StartingUnitEnum.NATURAL_YEAR.getKey())) {
+ if (CheckBoxEnum.CHECKED.getKey().equals(rzdqedablzs) && betweenMonth < 12
+ && sxrq.split("-")[0].equals(releaseDate.split("-")[0]) && releaseDate.split("-")[0].equals(qsrq.split("-")[0])) {
+ //入职不满一年，且入职当期额度按比例折算
+ restTime = getRestTime(insertHoliDayParam,vocationList,QuotaChangeMethodEnum.CONVERT,releaseDate);
+ }else {
+ if (QuotaChangeMethodEnum.CONVERT.getKey().equals(edbgsedclfs)) {
+ restTime = getRestTime(insertHoliDayParam,vocationList,QuotaChangeMethodEnum.CONVERT,releaseDate);
+ } else if (QuotaChangeMethodEnum.NO_CONVERT.getKey().equals(edbgsedclfs)) {
+ restTime = getRestTime(insertHoliDayParam,vocationList,QuotaChangeMethodEnum.NO_CONVERT,releaseDate);
+ }
+ }
+
+ }else if (edyxq.equals(StartingUnitEnum.STARTING_YEAR.getKey())) {
+ //起算年
+ int betweenYear = DateUtil.getBetWeenYears(qsrq,releaseDate.split(" ")[0]);
+ allMonths = Double.valueOf(ljcrglyfslwz).intValue();
+ int intervalYear = allMonths / 12+betweenYear;
+ Map vocationMap = VocationCommonUtil.getVocationMap(vocationList, intervalYear, yjzd);
+ double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
+ int days = 0;
+ if (DateUtil.getTime(qsrq).compareTo(DateUtil.getTime(sxrq)) >=0){
+ days = DateUtil.getBetWeenDays(qsrq,releaseDate)+1;
+ }else {
+ days = DateUtil.getBetWeenDays(sxrq,releaseDate)+1;
+ }
+ int yearDays = DateUtil.getDays(sxrq, Calendar.DAY_OF_YEAR);
+
+ } else if (edyxq.equals(StartingUnitEnum.NATURAL_MONTH.getKey())){
+ //自然月
+
+ } else if (edyxq.equals(StartingUnitEnum.STARTING_MONTH.getKey())){
+ //起始月
+
+ } else if (edyxq.equals(StartingUnitEnum.NATURAL_WEEK.getKey())){
+ //起自然周
+
+ } else if (edyxq.equals(StartingUnitEnum.STARTING_WEEK.getKey())){
+ //起算周
+
+ } else if (edyxq.equals(StartingUnitEnum.NATURAL_DAY.getKey())){
+ //自然天
+ }
+ insertHoliDayParam.put("ktsc", restTime);
+
+ VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,dataList);
}
+
+ public double getRestTime(Map insertHoliDayParam,List> vocationList,QuotaChangeMethodEnum changeMethodEnum,String releaseDate){
+ String sxrq = insertHoliDayParam.get("sxrq").toString();
+ String qsrq = Util.null2String(vocationList.get(0).get("qsrq"));
+ String nextSxrq = DateUtil.nextYear(sxrq,1,DateUtil.yyyyMMdd);
+ //累计承认工龄月份数栏位值
+ String ljcrglyfslwz = Util.null2String(vocationList.get(0).get("ljcrglyfslwz"));
+ //依据字段
+ String yjzd = Util.null2String(vocationList.get(0).get("yjzd"));
+ //尾数处理
+ String wscl = Util.null2String(vocationList.get(0).get("wscl"));
+ //提前执行发放操作的天数
+ int dqtqffts = Integer.valueOf(Util.null2String(vocationList.get(0).get("dqtqffts")));
+ //执行发放的时间点
+ String ffdtffsj = Util.null2String(vocationList.get(0).get("ffdtffsj"));
+
+ int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue();
+
+ String nowEndYearTime = releaseDate.split("-")[0]+"-12-31";
+ String forWardTime = DateUtil.beforeDay(nowEndYearTime,dqtqffts) +" "+ffdtffsj;
+ if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(forWardTime)) >=0){
+ String nextYear = DateUtil.nextYear(releaseDate,1,DateUtil.yyyy);
+ releaseDate = nextYear +"-01-01";
+ }
+
+ int yearDays = DateUtil.getDays(sxrq, Calendar.DAY_OF_YEAR);
+
+ double restTime=0.0;
+ //折算
+ if (changeMethodEnum == QuotaChangeMethodEnum.CONVERT){
+ int beginYearMonth = DateUtil.getBetWeenMonths(qsrq,sxrq);
+ if (beginYearMonth < 0){
+ beginYearMonth = 0;
+ }
+ beginYearMonth = beginYearMonth+seniority;
+ int endYearMonth = DateUtil.getBetWeenMonths(qsrq,nextSxrq);
+ endYearMonth = endYearMonth+seniority;
+ int beginYear = beginYearMonth/12;
+ int endYear = endYearMonth/12;
+ Map beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd);
+ Map endYearmap = VocationCommonUtil.getVocationMap(vocationList, endYear, yjzd);
+ double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
+ double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc")));
+
+ //残年分割日期
+ String divideTime = DateUtil.beforeMonth(qsrq,seniority);
+ divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
+
+ //当前后额定可休时长一样时，代表没有残年情况
+ if (beginEdktsc == endEdktsc){
+ if (DateUtil.getTime(qsrq).compareTo(DateUtil.getTime(sxrq)) >=0){
+ //新员工入职
+ int days = DateUtil.getBetWeenDays(qsrq,releaseDate)+1;
+ restTime = VocationCommonUtil.computeRestDays(days, yearDays, endEdktsc, wscl);
+ }else {
+ int days = DateUtil.getTime(releaseDate).getDayOfYear();
+ restTime = VocationCommonUtil.computeRestDays(days, yearDays, endEdktsc, wscl);
+ }
+ }else {
+ //考虑残年
+ if (DateUtil.getTime(qsrq).compareTo(DateUtil.getTime(sxrq)) >=0){
+ //新员工入职
+ if (DateUtil.getTime(divideTime).compareTo(DateUtil.getTime(qsrq)) >=0){
+ if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(divideTime)) >=0){
+ int beforeDays = DateUtil.getBetWeenDays(qsrq,divideTime);
+ double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
+
+ int afterDays = DateUtil.getBetWeenDays(divideTime,releaseDate)+1;
+ double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
+ restTime = beforeRestTime+afterRestTime;
+ }else {
+ int beforeDays = DateUtil.getBetWeenDays(qsrq,releaseDate)+1;
+ restTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
+ }
+ }else {
+ int afterDays = DateUtil.getBetWeenDays(qsrq,releaseDate)+1;
+ restTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
+ }
+ }else {
+ if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(divideTime)) >=0){
+ int beforeDays = DateUtil.getBetWeenDays(sxrq,divideTime);
+ double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
+
+ int afterDays = DateUtil.getBetWeenDays(divideTime,releaseDate)+1;
+ double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
+ restTime = beforeRestTime+afterRestTime;
+ }else {
+ int beforeDays = DateUtil.getBetWeenDays(sxrq,releaseDate)+1;
+ restTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
+ }
+ }
+ }
+
+ }else {
+ //不折算
+ int beginYearMonth = DateUtil.getBetWeenMonths(qsrq,sxrq);
+ if (beginYearMonth < 0){
+ beginYearMonth = 0;
+ }
+ beginYearMonth = beginYearMonth+seniority;
+ int beginYear = beginYearMonth/12;
+ Map beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd);
+ double beginEdktsc = Double.valueOf(beginYearmap.get("edktsc") == null? "0" :Util.null2String(beginYearmap.get("edktsc")));
+ int days = 0;
+ if (DateUtil.getTime(qsrq).compareTo(DateUtil.getTime(sxrq)) >=0){
+ days = DateUtil.getBetWeenDays(qsrq,releaseDate)+1;
+ }else {
+ days = DateUtil.getBetWeenDays(sxrq,releaseDate)+1;
+ }
+ restTime=VocationCommonUtil.computeRestDays(days, yearDays, beginEdktsc, wscl);
+ }
+ return restTime;
+ }
+
+
}
diff --git a/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java b/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java
index 1bc4adb..f712ba7 100644
--- a/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java
+++ b/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java
@@ -9,6 +9,7 @@ import com.engine.common.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import weaver.general.Util;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
@@ -71,6 +72,10 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
vocationMap.put("qsrq", qsrq);
}
+ if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(qsrq)) < 0){
+ releaseDate=qsrq;
+ }
+
//相差天数
int betweenDays = DateUtil.getBetWeenDays(qsrq, releaseDate.split(" ")[0]);
//相差月份
@@ -88,9 +93,25 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
List> dataList = VocationCommonUtil.ifexist("uf_jcl_kq_jqye", insertHoliDayParam);
- //已存在数据且不覆盖
- if (dataList.size()>0 && !"1".equals(cover)) {
- return;
+ //
+ if (dataList.size()>0) {
+ String ffsj = Util.null2String(dataList.get(0).get("ffsj"));
+ String nowEndYearTime = ffsj.split("-")[0]+"-12-31";
+ String forWardTime = DateUtil.beforeDay(nowEndYearTime,dqtqffts) +" "+ffdtffsj;
+
+ int ffsjMonths = DateUtil.getTime(ffsj).getMonthValue();
+ int releaseDateMonths = DateUtil.getTime(releaseDate).getMonthValue();
+ if (DateUtil.getTime(ffsj).compareTo(DateUtil.getTime(forWardTime)) >=0){
+ ffsjMonths=1;
+ }
+ nowEndYearTime = releaseDate.split("-")[0]+"-12-31";
+ forWardTime = DateUtil.beforeDay(nowEndYearTime,dqtqffts) +" "+ffdtffsj;
+ if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(forWardTime)) >=0){
+ releaseDateMonths=1;
+ }
+ if (ffsjMonths == releaseDateMonths && !"1".equals(cover)){
+ return;
+ }
}
String sxrq = insertHoliDayParam.get("sxrq").toString();
//实际休息时长
@@ -104,9 +125,12 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
} else {
restTime = getRestTime(insertHoliDayParam,vocationList,QuotaChangeMethodEnum.NO_CONVERT,releaseDate);
}
-
- insertHoliDayParam.put("sxrq", DateUtil.nextYear(releaseDate.split(" ")[0], 1, DateUtil.yyyyMMdd));
-
+ if (CheckBoxEnum.CHECKED.getKey().equals(schdedkzsxrq)) {
+ int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue();
+ String divideTime = DateUtil.beforeMonth(qsrq,seniority);
+ divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
+ insertHoliDayParam.put("sxrq", divideTime);
+ }
insertHoliDayParam.put("ktsc", restTime);
} else if (allMonths >= 12 && edyxq.equals(StartingUnitEnum.NATURAL_YEAR.getKey())) {
//入职不满一年，且入职当期额度按比例折算
@@ -142,6 +166,7 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
}
}
insertHoliDayParam.put("ktsc",restTime);
+
VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye",insertHoliDayParam,dataList);
}
@@ -169,8 +194,8 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
String nextYear = DateUtil.nextYear(releaseDate,1,DateUtil.yyyy);
releaseDate = nextYear +"-01-01";
}
- int qsrqMonths = DateUtil.getDays(qsrq,Calendar.MONTH);
- int releaseDateMonths = DateUtil.getDays(releaseDate,Calendar.MONTH);
+ int qsrqMonths = DateUtil.getTime(qsrq).getMonthValue();
+ int releaseDateMonths = DateUtil.getTime(releaseDate).getMonthValue();
double restTime=0.0;
//折算
if (changeMethodEnum == QuotaChangeMethodEnum.CONVERT){
@@ -190,10 +215,10 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc")));
//残年分割日期
- String divideTime = DateUtil.beforeMonth(nextSxrq,endYearRemainder);
+ String divideTime = DateUtil.beforeMonth(qsrq,seniority);
+ divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
divideTime = DateUtil.nextMonth(divideTime,1,DateUtil.yyyyMM)+"-01";
- int divideTimeMonths = DateUtil.getDays(divideTime,Calendar.MONTH);
- int yearDays = DateUtil.getDays(sxrq, Calendar.DAY_OF_YEAR);
+ int divideTimeMonths = DateUtil.getTime(divideTime).getMonthValue();
if (beginEdktsc == endEdktsc){
//当前后额定可休时长一样时，代表没有残年情况
@@ -219,7 +244,7 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
restTime = getRestTime(months,endYearmap);
}
}else {
- int months = releaseDateMonths-qsrqMonths;
+ int months = releaseDateMonths-qsrqMonths+1;
restTime = getRestTime(months,endYearmap);
}
}else {
diff --git a/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java b/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java
index 1bd6f77..897ca88 100644
--- a/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java
+++ b/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java
@@ -73,6 +73,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
for (Map vocationMap : vocationList) {
vocationMap.put("qsrq", qsrq);
}
+ if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(qsrq)) < 0){
+ releaseDate=qsrq;
+ }
//相差天数
int betweenDays = DateUtil.getBetWeenDays(qsrq, releaseDate.split(" ")[0]);
@@ -82,10 +85,6 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
int allWorkDays = Double.valueOf(ljcrglyfslwz).intValue() * 30 + betweenDays;
//总月数
int allMonths = betweenMonth + Double.valueOf(ljcrglyfslwz).intValue();
- if (allMonths < 12 && !CheckBoxEnum.CHECKED.getKey().equals(schdedablzs)) {
- log.info("userId : [{}] 工龄小于1年", userId);
- return;
- }
Map insertHoliDayParam = VocationCommonUtil.getInsertHoliDayParam(vocationList.get(0), userId, qsrq, releaseDate);
@@ -135,7 +134,10 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
if (CheckBoxEnum.CHECKED.getKey().equals(schdedkzsxrq)) {
- insertHoliDayParam.put("sxrq", DateUtil.nextYear(releaseDate.split(" ")[0], 1, DateUtil.yyyyMMdd));
+ int seniority = "".equals(ljcrglyfslwz)?0:Double.valueOf(ljcrglyfslwz).intValue();
+ String divideTime = DateUtil.beforeMonth(qsrq,seniority);
+ divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
+ insertHoliDayParam.put("sxrq", divideTime);
}
insertHoliDayParam.put("ktsc", restTime);
} else if (allMonths >= 12 && edyxq.equals(StartingUnitEnum.NATURAL_YEAR.getKey())) {
@@ -288,8 +290,8 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
double endEdktsc = Double.valueOf(endYearmap.get("edktsc") == null? "0" :Util.null2String(endYearmap.get("edktsc")));
//残年分割日期
- String divideTime = DateUtil.beforeMonth(nextSxrq,endYearRemainder);
- divideTime = divideTime.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+qsrq.split("-")[2];
+ String divideTime = DateUtil.beforeMonth(qsrq,seniority);
+ divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
int yearDays = DateUtil.getDays(sxrq, Calendar.DAY_OF_YEAR);
if (beginEdktsc == endEdktsc){
@@ -306,9 +308,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
if (DateUtil.getTime(divideTime).compareTo(DateUtil.getTime(qsrq)) >=0){
int beforeDays = DateUtil.getBetWeenDays(qsrq,divideTime);
- int afterDays = DateUtil.getBetWeenDays(divideTime,nextSxrq);
+ int afterDays = DateUtil.getBetWeenDays(divideTime,nextSxrq)+1;
- double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, endEdktsc, wscl);
+ double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
restTime = beforeRestTime+afterRestTime;
}else {
@@ -318,8 +320,8 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
}else {
int beforeDays = DateUtil.getBetWeenDays(sxrq,divideTime);
- int afterDays = DateUtil.getBetWeenDays(divideTime,nextSxrq);
- double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, endEdktsc, wscl);
+ int afterDays = DateUtil.getBetWeenDays(divideTime,nextSxrq)+1;
+ double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
restTime = beforeRestTime+afterRestTime;
}
diff --git a/src/com/engine/attendance/vacation/util/VocationCommonUtil.java b/src/com/engine/attendance/vacation/util/VocationCommonUtil.java
index 7d0b2b9..7034862 100644
--- a/src/com/engine/attendance/vacation/util/VocationCommonUtil.java
+++ b/src/com/engine/attendance/vacation/util/VocationCommonUtil.java
@@ -417,7 +417,7 @@ public class VocationCommonUtil {
String jqid = Util.null2String(dataMap.get("jqid"));
String sxrq = Util.null2String(dataMap.get("sxrq"));
String jzrq = Util.null2String(dataMap.get("jzrq"));
- String sql = "select id from "+tableName +" where lyid=? and ygid=? and jqid=? and sxrq=? and jzrq=?";
+ String sql = "select id,ffsj from "+tableName +" where lyid=? and ygid=? and jqid=? and sxrq=? and jzrq=?";
List> dataList = DbTools.getSqlToList(sql,lyid,ygid,jqid,sxrq,jzrq);
return dataList;
diff --git a/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class b/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class
index 10827bc..4c2a01e 100644
Binary files a/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class and b/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class differ
diff --git a/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.class b/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.class
index 31977e8..c825b04 100644
Binary files a/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.class and b/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.class differ
diff --git a/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class b/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class
index 3fdcbb5..d065bc1 100644
Binary files a/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class and b/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class differ
diff --git a/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class b/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class
index 24c35a1..fb918dd 100644
Binary files a/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class and b/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class differ
diff --git a/target/test-classes/TestBySchedulePaymentWay.class b/target/test-classes/TestBySchedulePaymentWay.class
index 2e0fc5f..82dc0b6 100644
Binary files a/target/test-classes/TestBySchedulePaymentWay.class and b/target/test-classes/TestBySchedulePaymentWay.class differ
diff --git a/target/test-classes/TestObj.class b/target/test-classes/TestObj.class
index cec826f..fe5bf32 100644
Binary files a/target/test-classes/TestObj.class and b/target/test-classes/TestObj.class differ
diff --git a/test/TestBySchedulePaymentWay.java b/test/TestBySchedulePaymentWay.java
index a772ed1..3b7d949 100644
--- a/test/TestBySchedulePaymentWay.java
+++ b/test/TestBySchedulePaymentWay.java
@@ -12,14 +12,15 @@ public class TestBySchedulePaymentWay {
public static void main(String[] args) {
Map param = Maps.newHashMap();
param.put("userId","53");
- param.put("releaseDate","2023-01-29 00:00:00");
+ param.put("releaseDate","2021-06-01 00:00:00");
- String json = "[{modedatamodifier=1, edyxqsz=1.00, modedatacreatertype=0, jgsc1=5.00, jgsc0=1.00, yqhedzgxz='', edbgsedclfs='2', edyxq='1', ljcrglyfslwz='1', edktsc=5.00, mc=测试年假, MODEUUID=d1489670-ec11-49f5-8786-58a9ffc1167f, zyz='', id='18', jywxcl='', mainid='18', edkyqcs='', edfffs='0', jjrbhzedn='', modedatacreater='1', ffsj='', jb='112', edbxdcxw='', modedatacreatetime='15:52:56', schdedablzs='1', dczskxsc='', yjzd='', formmodeid='201', rzdqedablzs='1', fdsc01='1', ffdtffsj='00:00', yqsc='', fdsc07='7', fdsc06='6', szjg='2', fdsc09='9', fdsc08='8', qsrq='2021-11-11', fdsc03='3', modedatacreatedate='2023-12-28', fdsc02='2', requestId='', fdsc05='5', fdsc04='4', sm='', eddw='1', form_biz_id=18000333, edyj='2', dzqsrq='1', schdedkzsxrq='0', fdsc10='10', detailid='14', fdsc12='12', fdsc11='11', fgrq='15', wscl='2', dataid='18', dqtqffts='2', xxz='0', modedatamodifydatetime='2024-01-04 16:51:17'},{modedatamodifier=1, edyxqsz=2.00, modedatacreatertype=0, jgsc1=10.00, jgsc0=5.00, yqhedzgxz='', edbgsedclfs='2', edyxq='3', ljcrglyfslwz='1', edktsc=10.00, mc=测试年假, MODEUUID=d1489670-ec11-49f5-8786-58a9ffc1167f, zyz='', id='18', jywxcl='', mainid='18', edkyqcs='', edfffs='0', jjrbhzedn='', modedatacreater='1', ffsj='', jb='112', edbxdcxw='', modedatacreatetime='15:52:56', schdedablzs='1', dczskxsc='', yjzd='', formmodeid='201', rzdqedablzs='1', fdsc01='1', ffdtffsj='00:00', yqsc='', fdsc07='7', fdsc06='6', szjg='2', fdsc09='9', fdsc08='8', qsrq='2021-11-11', fdsc03='3', modedatacreatedate='2023-12-28', fdsc02='2', requestId='', fdsc05='5', fdsc04='4', sm='', eddw='1', form_biz_id=18000333, edyj='2', dzqsrq='1', schdedkzsxrq='0', fdsc10='10', detailid='15', fdsc12='12', fdsc11='11', fgrq='15', wscl='2', dataid='18', dqtqffts='15', xxz='0', modedatamodifydatetime='2024-01-04 16:51:17'}]";
+ String json = "[{modedatamodifier=1, edyxqsz=1.00, modedatacreatertype=0, jgsc1=5.00, jgsc0=1.00, yqhedzgxz='', edbgsedclfs='1', edyxq='0', ljcrglyfslwz='5', edktsc=5.00, mc=测试年假, MODEUUID=d1489670-ec11-49f5-8786-58a9ffc1167f, zyz='', id='18', jywxcl='', mainid='18', edkyqcs='', edfffs='0', jjrbhzedn='', modedatacreater='1', ffsj='', jb='112', edbxdcxw='', modedatacreatetime='15:52:56', schdedablzs='1', dczskxsc='', yjzd='', formmodeid='201', rzdqedablzs='1', fdsc01='1', ffdtffsj='00:00', yqsc='', fdsc07='7', fdsc06='6', szjg='2', fdsc09='9', fdsc08='8', qsrq='2021-05-11', fdsc03='3', modedatacreatedate='2023-12-28', fdsc02='2', requestId='', fdsc05='5', fdsc04='4', sm='', eddw='1', form_biz_id=18000333, edyj='2', dzqsrq='1', schdedkzsxrq='0', fdsc10='10', detailid='14', fdsc12='12', fdsc11='11', fgrq='15', wscl='2', dataid='18', dqtqffts='2', xxz='0', modedatamodifydatetime='2024-01-04 16:51:17'},{modedatamodifier=1, edyxqsz=2.00, modedatacreatertype=0, jgsc1=10.00, jgsc0=5.00, yqhedzgxz='', edbgsedclfs='2', edyxq='3', ljcrglyfslwz='1', edktsc=10.00, mc=测试年假, MODEUUID=d1489670-ec11-49f5-8786-58a9ffc1167f, zyz='', id='18', jywxcl='', mainid='18', edkyqcs='', edfffs='0', jjrbhzedn='', modedatacreater='1', ffsj='', jb='112', edbxdcxw='', modedatacreatetime='15:52:56', schdedablzs='1', dczskxsc='', yjzd='', formmodeid='201', rzdqedablzs='1', fdsc01='1', ffdtffsj='00:00', yqsc='', fdsc07='7', fdsc06='6', szjg='2', fdsc09='9', fdsc08='8', qsrq='2021-11-11', fdsc03='3', modedatacreatedate='2023-12-28', fdsc02='2', requestId='', fdsc05='5', fdsc04='4', sm='', eddw='1', form_biz_id=18000333, edyj='2', dzqsrq='1', schdedkzsxrq='0', fdsc10='10', detailid='15', fdsc12='12', fdsc11='11', fgrq='15', wscl='2', dataid='18', dqtqffts='15', xxz='0', modedatamodifydatetime='2024-01-04 16:51:17'}]";
Gson gson = new Gson();
List> vocationList = Lists.newArrayList();
vocationList = gson.fromJson(json, (Type) vocationList.getClass());
System.out.println(vocationList);
+
param.put("vocationList",vocationList);
new BySchedulePaymentWay().compute(param);
}
diff --git a/test/TestObj.java b/test/TestObj.java
index 4773270..b967ef6 100644
--- a/test/TestObj.java
+++ b/test/TestObj.java
@@ -32,12 +32,13 @@ public class TestObj {
// System.out.println(DateUtil.getBetWeenDays("2024-01-02","2024-01-10"));
// System.out.println(DateUtil.getBetWeenMonths("2021-06-01","2022-07-01"));
-// System.out.println(DateUtil.beforeMonth("2023-01-01",6));
- System.out.println(DateUtil.getBetWeenYears("2023-05-01","2024-01-01"));
- //System.out.println(DateUtil.getBetWeenDays("2023-01-01","2023-01-01"));
-// System.out.println(DateUtil.getBetWeenDays("2023-08-02","2024-01-01"));
-
-
+ //System.out.println(DateUtil.beforeMonth("2021-06-01",14));
+ // System.out.println(DateUtil.getTime("2023-02-29 00:00:00").getMonthValue());
+ //System.out.println(DateUtil.getBetWeenYears("2023-05-01","2024-01-01"));
+ System.out.println(DateUtil.getBetWeenDays("2023-01-01","2023-08-01"));
+ System.out.println(DateUtil.getBetWeenDays("2023-08-01","2023-12-31"));
+// System.out.println(DateUtil.getDays("2023-01-01 00:00:00",Calendar.DAY_OF_YEAR));
+// System.out.println(DateUtil.getTime("2023-01-01 00:00:00").getDayOfYear());
//System.out.println(VocationCommonUtil.computeRestDays(70,365,7,"4"));
//System.out.println(DateUtil.nextMonth("2023-11-25 15:22:11",1,DateUtil.yyyyMM));
// System.out.println(DateUtil.getBetWeenYears("2023-05-01","2025-04-31"));