From 68b3e5579cfe6dcb5840665cd79026aec4feabe1 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Tue, 9 Jan 2024 20:19:39 +0800
Subject: [PATCH] liuliang

---
 .idea/workspace.xml                           |  45 ++++--
 log/sdk.log                                   | 111 ++++++++++++++
 .../tactics/ByIntervalPayMentWay.java         | 140 +++++++++++++++---
 .../vacation/util/VocationCommonUtil.java     |  16 +-
 .../tactics/ByIntervalPayMentWay.class        | Bin 8243 -> 11989 bytes
 .../tactics/SinglePaymentInFullWay.class      | Bin 9314 -> 9318 bytes
 .../vacation/util/VocationCommonUtil.class    | Bin 13138 -> 13037 bytes
 .../TestByIntervalPayMentWay.class            | Bin 0 -> 3474 bytes
 target/test-classes/TestObj.class             | Bin 1181 -> 1227 bytes
 test/TestByIntervalPayMentWay.java            |  27 ++++
 test/TestObj.java                             |   6 +-
 11 files changed, 301 insertions(+), 44 deletions(-)
 create mode 100644 target/test-classes/TestByIntervalPayMentWay.class
 create mode 100644 test/TestByIntervalPayMentWay.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 541ff65..c48642e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,15 +10,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/test/TestByIntervalPayMentWay.java" 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$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/util/VocationCommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/util/VocationCommonUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/TestBySchedulePaymentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestBySchedulePaymentWay.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.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$/test/TestBySchedulePaymentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestBySchedulePaymentWay.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/test/TestObj.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestObj.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -83,22 +82,22 @@
       <recent name="com.api.attendance.attendanceAnalysis" />
     </key>
   </component>
-  <component name="RunManager" selected="Application.TestObj">
-    <configuration name="TestBySchedulePaymentWay (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="TestBySchedulePaymentWay" />
+  <component name="RunManager" selected="Application.TestByIntervalPayMentWay">
+    <configuration name="TestByIntervalPayMentWay" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="TestByIntervalPayMentWay" />
+      <module name="hrm-attendance" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestBySchedulePaymentWay" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+    <configuration name="TestBySchedulePaymentWay (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="TestBySchedulePaymentWay" />
-      <module name="hrm-attendance" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestGetClockInPoint" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="TestGetClockInPoint" />
+    <configuration name="TestBySchedulePaymentWay" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="TestBySchedulePaymentWay" />
       <module name="hrm-attendance" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -120,11 +119,11 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="Application.TestByIntervalPayMentWay" />
         <item itemvalue="Application.TestObj" />
         <item itemvalue="Application.TestBySchedulePaymentWay" />
         <item itemvalue="Application.TestBySchedulePaymentWay (1)" />
         <item itemvalue="Application.TestSinglePaymentFullWay" />
-        <item itemvalue="Application.TestGetClockInPoint" />
       </list>
     </recent_temporary>
   </component>
@@ -370,7 +369,7 @@
       <workItem from="1704624857172" duration="13062000" />
       <workItem from="1704677723452" duration="30230000" />
       <workItem from="1704725663394" duration="16000" />
-      <workItem from="1704764236606" duration="17852000" />
+      <workItem from="1704764236606" duration="31783000" />
     </task>
     <servers />
   </component>
@@ -418,6 +417,26 @@
           <line>90</line>
           <option name="timeStamp" value="49" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java</url>
+          <line>254</line>
+          <option name="timeStamp" value="106" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java</url>
+          <line>284</line>
+          <option name="timeStamp" value="107" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/util/VocationCommonUtil.java</url>
+          <line>335</line>
+          <option name="timeStamp" value="116" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java</url>
+          <line>243</line>
+          <option name="timeStamp" value="117" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
diff --git a/log/sdk.log b/log/sdk.log
index e8419e0..4dbda63 100644
--- a/log/sdk.log
+++ b/log/sdk.log
@@ -1666,3 +1666,114 @@
 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}]
+2024-01-09 19:14:17,190 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:14:17,198 [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, jzrq=2021-12-31}]
+2024-01-09 19:14:52,837 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:15:20,002 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:19:23,256 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:19:23,271 [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=0.0, jzrq=2021-12-31}]
+2024-01-09 19:24:23,307 [Timer-0] [A2] [INFO] - rootPath == null
+2024-01-09 19:24:23,309 [Timer-0] [A2] [INFO] - filePath == nullWEB-INF\prop\isSyncLog4j.properties
+2024-01-09 19:27:49,855 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:27:49,871 [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=0.0, jzrq=2021-12-31}]
+2024-01-09 19:29:30,859 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:29:30,874 [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-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 19:31:22,945 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:33:24,575 [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-01 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 19:34:07,210 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:34:07,235 [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-01 00:00:00, lyid=18, ktsc=0.4247, jzrq=2021-12-31}]
+2024-01-09 19:37:52,972 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:38:05,451 [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-17 00:00:00, lyid=18, ktsc=2.7397, jzrq=2021-12-31}]
+2024-01-09 19:39:09,145 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:39:13,597 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-12-20 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 19:39:22,925 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:39:38,752 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-12-20 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 19:39:47,871 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:40:04,477 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-12-20 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 19:40:09,109 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:40:58,672 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-12-20 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 19:41:08,294 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:42:01,481 [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-15 00:00:00, lyid=18, ktsc=2.9315, jzrq=2021-12-31}]
+2024-01-09 19:42:21,875 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:42:23,388 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-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 19:42:49,449 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:43:05,196 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-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 19:43:52,673 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:43:52,688 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-01-01 00:00:00, lyid=18, ktsc=0.0137, jzrq=2022-12-31}]
+2024-01-09 19:44:02,051 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:44:22,421 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2022-01-01 00:00:00, lyid=18, ktsc=0.0137, jzrq=2022-12-31}]
+2024-01-09 19:44:36,034 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:44:36,046 [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-15 00:00:00, lyid=18, ktsc=5.0, jzrq=2022-12-31}]
+2024-01-09 19:47:10,651 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:47:10,668 [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-15 00:00:00, lyid=18, ktsc=0.6164, jzrq=2021-12-31}]
+2024-01-09 19:47:21,631 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:47:38,832 [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-15 00:00:00, lyid=18, ktsc=0.6164, jzrq=2021-12-31}]
+2024-01-09 19:47:56,182 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:48:29,958 [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-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-12-31}]
+2024-01-09 19:50:10,047 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:50:14,121 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-01-01, jqid=112, qsrq=2021-06-01, ffsj=2021-12-16 00:00:00, lyid=18, ktsc=0.0, jzrq=2022-12-31}]
+2024-01-09 19:50:46,513 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:51:07,331 [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=0.0, jzrq=2021-12-31}]
+2024-01-09 19:51:28,589 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:52:06,155 [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=0.0, jzrq=2022-12-31}]
+2024-01-09 19:53:06,344 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:53:06,358 [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=2.5206, jzrq=2023-05-31}]
+2024-01-09 19:53:24,538 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:54:20,425 [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=2.5206, jzrq=2023-05-31}]
+2024-01-09 19:54:47,074 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:54:47,090 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-05-05 00:00:00, lyid=18, ktsc=4.6438, jzrq=2023-05-31}]
+2024-01-09 19:55:00,475 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:55:00,488 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2022-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-05-15 00:00:00, lyid=18, ktsc=5.0, jzrq=2023-05-31}]
+2024-01-09 19:55:12,007 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:55:12,021 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-05-16 00:00:00, lyid=18, ktsc=0.0, jzrq=2024-05-31}]
+2024-01-09 19:55:40,594 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:55:40,610 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-06-01, jqid=112, qsrq=2021-06-01, ffsj=2023-05-16 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-06-30}]
+2024-01-09 19:56:02,073 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:56:02,089 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-05-01, jqid=112, qsrq=2021-06-01, ffsj=2023-05-14 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-05-31}]
+2024-01-09 19:56:20,272 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:56:20,285 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-05-01, jqid=112, qsrq=2021-06-01, ffsj=2023-05-14 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-05-31}]
+2024-01-09 19:56:36,184 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:57:14,821 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-05-01, jqid=112, qsrq=2021-06-01, ffsj=2023-05-14 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-05-31}]
+2024-01-09 19:57:28,391 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:57:28,410 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-08-01, jqid=112, qsrq=2021-06-01, ffsj=2021-08-14 00:00:00, lyid=18, ktsc=2.2581, jzrq=2021-08-31}]
+2024-01-09 19:57:39,928 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:57:39,944 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-08-01, jqid=112, qsrq=2021-06-01, ffsj=2021-08-15 00:00:00, lyid=18, ktsc=5.0, jzrq=2021-08-31}]
+2024-01-09 19:58:56,726 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:58:58,511 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-08-01, jqid=112, qsrq=2021-06-01, ffsj=2021-08-15 00:00:00, lyid=18, ktsc=2.4194, jzrq=2021-08-31}]
+2024-01-09 19:59:10,793 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 19:59:31,436 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:00:06,272 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:00:17,865 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:00:46,977 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:02:16,522 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:02:16,534 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-08-01, jqid=112, qsrq=2021-06-01, ffsj=2021-08-15 00:00:00, lyid=18, ktsc=2.4194, jzrq=2021-08-31}]
+2024-01-09 20:02:56,618 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:02:56,634 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-08-16, jqid=112, qsrq=2021-06-01, ffsj=2021-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-08-22}]
+2024-01-09 20:03:52,954 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:04:48,848 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-08-16, jqid=112, qsrq=2021-06-01, ffsj=2021-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-08-22}]
+2024-01-09 20:05:35,982 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:06:06,199 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2021-08-16, jqid=112, qsrq=2021-06-01, ffsj=2021-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2021-08-22}]
+2024-01-09 20:08:02,234 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:08:02,250 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-07-15, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-07-21}]
+2024-01-09 20:08:45,601 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:09:51,798 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-07-15, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-07-21}]
+2024-01-09 20:10:28,055 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:10:28,070 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-14, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-20}]
+2024-01-09 20:10:57,300 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:11:40,051 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-14, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-20}]
+2024-01-09 20:11:54,617 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:11:54,631 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-15, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-21}]
+2024-01-09 20:11:58,632 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:11:58,643 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-15, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-21}]
+2024-01-09 20:12:19,323 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:12:50,026 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-15, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-21}]
+2024-01-09 20:13:10,551 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:13:12,981 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-15, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-21}]
+2024-01-09 20:14:38,023 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:15:39,189 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-14, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-20}]
+2024-01-09 20:16:06,664 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:16:06,678 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-16, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-16}]
+2024-01-09 20:17:15,621 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:17:36,362 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-16, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-16}]
+2024-01-09 20:18:01,081 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - getAfterAdjustTime qsrq : [2021-06-01]
+2024-01-09 20:18:01,091 [main] [com.engine.attendance.vacation.util.VocationCommonUtil] [INFO] - updateHolidayBalance dataMap:[{ygid=53, sxrq=2023-08-15, jqid=112, qsrq=2021-06-01, ffsj=2023-08-15 00:00:00, lyid=18, ktsc=0.0, jzrq=2023-08-15}]
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 5584556..1983d66 100644
--- a/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java
+++ b/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java
@@ -5,8 +5,10 @@ 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.TimeUtil;
 import weaver.general.Util;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
@@ -47,7 +49,7 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
         //分割日期
         String fgrq = Util.null2String(vocationList.get(0).get("fgrq"));
         //提前执行发放操作的天数
-        String dqtqffts = Util.null2String(vocationList.get(0).get("dqtqffts"));
+        int dqtqffts = Integer.valueOf(Util.null2String(vocationList.get(0).get("dqtqffts")));
         //执行发放的时间点
         String ffdtffsj = Util.null2String(vocationList.get(0).get("ffdtffsj"));
         //入职当期额度按比例折算
@@ -83,9 +85,10 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
 
         Map<String, Object> insertHoliDayParam = VocationCommonUtil.getInsertHoliDayParam(vocationList.get(0), userId, qsrq, releaseDate);
 
-        List<Map<String,Object>> dataList = VocationCommonUtil.ifexist("uf_jcl_kq_jqye", insertHoliDayParam);
+       // List<Map<String,Object>> dataList = VocationCommonUtil.ifexist("uf_jcl_kq_jqye", insertHoliDayParam);
 
         String sxrq = insertHoliDayParam.get("sxrq").toString();
+        String jzrq = insertHoliDayParam.get("jzrq").toString();
         //实际休息时长
         double restTime = 0;
 
@@ -118,6 +121,12 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
 
         }else if (edyxq.equals(StartingUnitEnum.STARTING_YEAR.getKey())) {
             //起算年
+            String startTime = releaseDate.split("-")[0]+"-"+qsrq.split("-")[1]+"-"+qsrq.split("-")[2];
+            String beforeEndTime = DateUtil.beforeDay(startTime,1);
+            String criticalTime = DateUtil.beforeDay(beforeEndTime,dqtqffts+1);
+            if (releaseDate.split(" ")[0].equals(criticalTime)){
+                releaseDate = beforeEndTime;
+            }
             int betweenYear = DateUtil.getBetWeenYears(qsrq,releaseDate.split(" ")[0]);
             allMonths = Double.valueOf(ljcrglyfslwz).intValue();
             int intervalYear = allMonths / 12+betweenYear;
@@ -125,31 +134,121 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
             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;
+                days = DateUtil.getBetWeenDays(qsrq,releaseDate.split(" ")[0])+1;
             }else {
-                days = DateUtil.getBetWeenDays(sxrq,releaseDate)+1;
+                days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
+            }
+            if (days<0){
+                days = 0;
             }
             int yearDays = DateUtil.getDays(sxrq, Calendar.DAY_OF_YEAR);
+            restTime=VocationCommonUtil.computeRestDays(days, yearDays, edktsc, wscl);
 
         } else if (edyxq.equals(StartingUnitEnum.NATURAL_MONTH.getKey())){
             //自然月
+            int beforeDays = DateUtil.getDays(releaseDate,Calendar.DAY_OF_MONTH);
+            String criticalTime = DateUtil.beforeDay(releaseDate.split("-")[0]+"-"+releaseDate.split("-")[1]+"-"+beforeDays,dqtqffts+1);
+            if (releaseDate.split(" ")[0].equals(criticalTime)){
+                releaseDate = releaseDate.split("-")[0]+"-"+releaseDate.split("-")[1]+"-"+beforeDays;
+            }
+
+            betweenMonth = DateUtil.getBetWeenMonths(qsrq,sxrq);
+
+            allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue();
+            Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd);
+            int days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
+            if (days <0){
+                days=0;
+            }
+            int monthDays = DateUtil.getDays(sxrq,Calendar.DAY_OF_MONTH);
+
+            double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
+            restTime = VocationCommonUtil.computeRestDays(days, monthDays, edktsc, wscl);
 
         } else if (edyxq.equals(StartingUnitEnum.STARTING_MONTH.getKey())){
-            //起始月
+            ///起算月
+            String beforeEndTime = DateUtil.beforeDay(sxrq,1);
+            String criticalTime = DateUtil.beforeDay(beforeEndTime,dqtqffts+1);
+            if (releaseDate.split(" ")[0].equals(criticalTime)){
+                releaseDate = beforeEndTime;
+            }
+
+            betweenMonth = DateUtil.getBetWeenMonths(qsrq,sxrq);
+            allMonths = betweenMonth+Double.valueOf(ljcrglyfslwz).intValue();
+
+            Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allMonths, yjzd);
+            double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
+            int days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
+            if (days <0){
+                days=0;
+            }
+            int monthDays = DateUtil.getBetWeenDays(sxrq,jzrq)+1;
+            restTime = VocationCommonUtil.computeRestDays(days, monthDays, edktsc, wscl);
 
         } else if (edyxq.equals(StartingUnitEnum.NATURAL_WEEK.getKey())){
             //起自然周
+            int dayOfWeek = TimeUtil.getDayOfWeek(releaseDate);
+            if (dayOfWeek == 0){
+                dayOfWeek = 7;
+            }
+            String time = releaseDate.split("-")[0]+"-"+releaseDate.split("-")[1] +"-"+releaseDate.split(" ")[0].split("-")[2];
+            String beforeJxrq = DateUtil.AfterDay(time,8-dayOfWeek);
+            String criticalTime = DateUtil.beforeDay(beforeJxrq,dqtqffts+1);
+            if (releaseDate.split(" ")[0].equals(criticalTime)){
+                releaseDate = beforeJxrq;
+            }
+
+            betweenDays = DateUtil.getBetWeenDays(qsrq,sxrq)+1;
+            if (DateUtil.getTime(sxrq).compareTo(DateUtil.getTime(qsrq)) <=0){
+                betweenDays = 0;
+            }
+            allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
+            Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd);
+            double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
+
+            int days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
+            if (days <0){
+                days=0;
+            }
+            int monthDays = 7;
+            restTime = VocationCommonUtil.computeRestDays(days, monthDays, edktsc, wscl);
 
         } else if (edyxq.equals(StartingUnitEnum.STARTING_WEEK.getKey())){
             //起算周
+            String time = releaseDate.split("-")[0]+"-"+releaseDate.split("-")[1] +"-"+releaseDate.split(" ")[0].split("-")[2];
+            int day = DateUtil.getBetWeenDays(qsrq,time);
+            int residueDays = day%7;
+            String beforeSxrq = DateUtil.beforeDay(time,residueDays);
+            String beforeEndTime = DateUtil.AfterDay(beforeSxrq,6);
+            String criticalTime = DateUtil.beforeDay(beforeEndTime,dqtqffts+1);
+            if (releaseDate.split(" ")[0].equals(criticalTime)){
+                releaseDate = beforeEndTime;
+            }
+
+            betweenDays = DateUtil.getBetWeenDays(qsrq,sxrq)+1;
+            if (betweenDays <=7){
+                betweenDays=0;
+            }
+            allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
+            Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays/7, yjzd);
+            int days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
+            if (days <0){
+                days=0;
+            }
+            double edktsc = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
+            int monthDays = 7;
+            restTime = VocationCommonUtil.computeRestDays(days, monthDays, edktsc, wscl);
 
         } else if (edyxq.equals(StartingUnitEnum.NATURAL_DAY.getKey())){
             //自然天
-
+            betweenDays = DateUtil.getBetWeenDays(qsrq,sxrq)+1;
+            allWorkDays = Double.valueOf(ljcrglyfslwz).intValue()*30+betweenDays;
+            Map<String, Object> vocationMap = VocationCommonUtil.getVocationMap(vocationList, allWorkDays, yjzd);
+            restTime = vocationMap.size()>0?Double.valueOf(vocationMap.get("edktsc").toString()):0;
         }
         insertHoliDayParam.put("ktsc", restTime);
 
-        VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,dataList);
+        VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,new ArrayList<>());
     }
 
     public double getRestTime(Map<String, Object> insertHoliDayParam,List<Map<String, Object>> vocationList,QuotaChangeMethodEnum changeMethodEnum,String releaseDate){
@@ -170,10 +269,13 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
         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";
+        if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(sxrq)) <0){
+            return 0;
+        }
+        //临界时间点，直接发放全年
+        String criticalTime = DateUtil.beforeDay(nowEndYearTime,dqtqffts+1);
+        if (releaseDate.split(" ")[0].equals(criticalTime)){
+            releaseDate = nowEndYearTime;
         }
 
         int yearDays = DateUtil.getDays(sxrq, Calendar.DAY_OF_YEAR);
@@ -203,7 +305,7 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
             if (beginEdktsc == endEdktsc){
                 if (DateUtil.getTime(qsrq).compareTo(DateUtil.getTime(sxrq)) >=0){
                     //新员工入职
-                    int days = DateUtil.getBetWeenDays(qsrq,releaseDate)+1;
+                    int days = DateUtil.getBetWeenDays(qsrq,releaseDate.split(" ")[0])+1;
                     restTime = VocationCommonUtil.computeRestDays(days, yearDays, endEdktsc, wscl);
                 }else {
                     int days = DateUtil.getTime(releaseDate).getDayOfYear();
@@ -218,15 +320,15 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
                             int beforeDays = DateUtil.getBetWeenDays(qsrq,divideTime);
                             double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
 
-                            int afterDays = DateUtil.getBetWeenDays(divideTime,releaseDate)+1;
+                            int afterDays = DateUtil.getBetWeenDays(divideTime,releaseDate.split(" ")[0])+1;
                             double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
                             restTime = beforeRestTime+afterRestTime;
                         }else {
-                            int beforeDays = DateUtil.getBetWeenDays(qsrq,releaseDate)+1;
+                            int beforeDays = DateUtil.getBetWeenDays(qsrq,releaseDate.split(" ")[0])+1;
                             restTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
                         }
                     }else {
-                        int afterDays = DateUtil.getBetWeenDays(qsrq,releaseDate)+1;
+                        int afterDays = DateUtil.getBetWeenDays(qsrq,releaseDate.split(" ")[0])+1;
                         restTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
                     }
                 }else {
@@ -234,11 +336,11 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
                         int beforeDays = DateUtil.getBetWeenDays(sxrq,divideTime);
                         double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
 
-                        int afterDays = DateUtil.getBetWeenDays(divideTime,releaseDate)+1;
+                        int afterDays = DateUtil.getBetWeenDays(divideTime,releaseDate.split(" ")[0])+1;
                         double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
                         restTime = beforeRestTime+afterRestTime;
                     }else {
-                        int beforeDays = DateUtil.getBetWeenDays(sxrq,releaseDate)+1;
+                        int beforeDays = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
                         restTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
                     }
                 }
@@ -256,9 +358,9 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
             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;
+                days = DateUtil.getBetWeenDays(qsrq,releaseDate.split(" ")[0])+1;
             }else {
-                days = DateUtil.getBetWeenDays(sxrq,releaseDate)+1;
+                days = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
             }
             restTime=VocationCommonUtil.computeRestDays(days, yearDays, beginEdktsc, wscl);
         }
diff --git a/src/com/engine/attendance/vacation/util/VocationCommonUtil.java b/src/com/engine/attendance/vacation/util/VocationCommonUtil.java
index 7034862..abd85df 100644
--- a/src/com/engine/attendance/vacation/util/VocationCommonUtil.java
+++ b/src/com/engine/attendance/vacation/util/VocationCommonUtil.java
@@ -294,8 +294,8 @@ public class VocationCommonUtil {
             String sxrq = ffsj.split("-")[0]+"-"+ffsj.split("-")[1]+"-"+qsrq.split("-")[2];
             String beforeEndTime = DateUtil.beforeDay(sxrq,1);
             String beforeSxrq = DateUtil.beforeMonth(sxrq,1);
-            String beforeJzrq = DateUtil.nextMonth(beforeEndTime,edyxqsz-1,DateUtil.yyyyMM);
-            String jzrq = DateUtil.nextMonth(beforeEndTime,edyxqsz,DateUtil.yyyyMM);
+            String beforeJzrq = DateUtil.nextMonth(beforeEndTime,edyxqsz-1,DateUtil.yyyyMMdd);
+            String jzrq = DateUtil.nextMonth(beforeEndTime,edyxqsz,DateUtil.yyyyMMdd);
 
             String forWardTime = DateUtil.beforeDay(beforeEndTime,dqtqffts)+" "+ffdtffsj;
 
@@ -314,9 +314,9 @@ public class VocationCommonUtil {
             if (dayOfWeek == 0){
                 dayOfWeek = 7;
             }
-            String time = ffsj.split("-")[0]+"-"+ffsj.split("-")[1] +"-"+ffsj.split(" ")[0].split("-")[2];
+            String time = ffsj.split(" ")[0];
             String sxrq = DateUtil.AfterDay(time,8-dayOfWeek);
-            String beforeSxrq = DateUtil.beforeMonth(time,dayOfWeek-1);
+            String beforeSxrq = DateUtil.beforeDay(time,dayOfWeek-1);
             String beforeJxrq = DateUtil.AfterDay(time,8-dayOfWeek);
 
             String forWardTime = DateUtil.beforeDay(beforeJxrq,dqtqffts)+" "+ffdtffsj;
@@ -331,12 +331,10 @@ public class VocationCommonUtil {
                 param.put("jzrq",DateUtil.AfterDay(beforeSxrq,7*edyxqsz-1));
             }
 
-
-
         }else if (edyxq.equals(StartingUnitEnum.STARTING_WEEK.getKey())){
 
-            String time = ffsj.split("-")[0]+"-"+ffsj.split("-")[1] +"-"+ffsj.split(" ")[0].split("-")[2];
-            int days = DateUtil.getBetWeenDays(qsrq,time);
+            String time = ffsj.split(" ")[0];
+            int days = DateUtil.getBetWeenDays(qsrq,time)+1;
             int residueDays = days%7;
             String beforeSxrq = DateUtil.beforeDay(time,residueDays);
             String beforeEndTime = DateUtil.AfterDay(beforeSxrq,6);
@@ -355,7 +353,7 @@ public class VocationCommonUtil {
             }
 
         }else if (edyxq.equals(StartingUnitEnum.NATURAL_DAY.getKey())){
-            String sxrq = DateUtil.AfterDay(ffsj.split(" ")[0],1);
+            String sxrq = DateUtil.AfterDay(ffsj.split(" ")[0],0);
             param.put("sxrq",sxrq);
             param.put("jzrq",sxrq);
         }
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 4c2a01e3c29828f2692a6752a3033cb89ff61b48..6adbce2a1867a259293453b07185188ba06443b5 100644
GIT binary patch
literal 11989
zcmb_i34B!5)&HOOX6C(2UP87><^`Cngs_CLnL?l}2?4?qkOUBw!jPFH6NX7LnE>Il
zrL9=oy42RXqSolAsMT7j#y~gQYFq1PH(Tvyzpl2{e%(H8t!zE_ZSxX>r7ij8_vYMl
z?>+Zy_uO;td*3*H{0ji)Q`C>`_@atKnaILZetZdER&kYz52*NxA5Y^MKfa2uskmCf
z*E5lcXBB)y#fMaUSj9Ceu2pfJitAN;M8yq$Jcs`gkLOi<RK>?s+^FK?DsEPBiyz;_
zw*-N2XW~2fu6Vp4mi(Te|9wAR#7ioEAXfaL!2C!&e(c9j@UnP3FQ)%g#hrrN|5b5U
z27ZR0`}y&U4Ez$m^7DhCU*i=&KYroI<@k;0_^lxGs)FD7u|P=qn)v;_crcOw6O{iT
zDE(0k`;&P5SuFGy!Px(+*e3?OuHX&P^H<UHH!=E6G5_xZdP_V`_;C`a#E{dXdB)3n
z6@NZ%5mX|DBtP2lMJ7OU2EIxj9!y@9d@3m{IjIU|DCActli*t%OT<!32y*qbEd)<v
zPb5m1ur8K}whZjq6-~B<cf}c#x2~r>9N!X7#zfmfdQx4nenRWI_MSbp(L^Utstu=7
z(L^MiXph$J4Y!9=v7SV2ch9ccuAX=-5+3Y~CZb6bn+mt5V(tC44TH^zR5ZCa9N!oo
zTpvxOwuT265tROc-rk;MikYfzo^~lAyEmHb?@2Vq!~Ojou|Wbg6S7*F%<lE!UW+A#
zS?L`}3687Rb%*zcYX?%Xcr6cDB;?E7%VG$g7$L+QJ%W(YA5Fx1lCcz%_eWxTW07cE
zY>y$oF*F`dbk??}lCeZ5vzXDJ3MW(MfUI57j-F(+DG@Q-T02vTvChn9=B{XJUo@K7
z77Zr}TFjEzZ2F>+-KqX|mS_b_%UWWks)Iaog#r3a(q<!LPfsG%Wx+gjL&w%=bT>~+
z8GKq}*X&RBu}!(3Wll!>W08TVIma5%Y7F4DQek$2f&OT+IbsZrN5lO*RA|uK-m^C<
zxV4qGF4oWH$Z=^+U|12JzJ9Tu5{(S*@9RInQw@lx#=F~-o$<kr{`fvddj`7?@G`#0
z0ds<<qf^XNBYmm9j*gTNyQ3qL>gee27R(%o^hG1=ZwI&|v%kG7l5RyKyE^-$k@k28
z_j#g`$Ugqr*WVuJHO-N`5A+){+L|}T*DO1%7g}Vh;dp#&Pja`}nZYfigK6f)60DTe
zYIa-h+!#)V_wWiPNl*6ygKbu<W&Og@+hefT-Xa&dl*K-`*lfDp$c5Rkt2^4BTC{{U
zy2>?ADA}55JM($cS+YnWP3(4jgX5_}S?sf|vCc#|HIQTjFBr2$&XcOKkvgNPO^*1T
zV+bu8!~LRjM2Ki&U{8PT#REO5aAOy5t?2q_s;ei`#Au6zTT|0`cVwG;A-!})xPya-
zX}>H3PWSO(j!9yVS?1O_G`X4?PQUP7vy1)5!R`@3!f$mL4R$7`*ko<j4DPbwoc1vS
z5a#_GQu7W-ME9r6?U|kE+1F&UC8CHz*@UOZsQNr@HpU?Tt~>o361n`_3Y@}@{??v>
zWP5aFOdKxyct^l25pXr^z)p=OP>w>m8s$+w0qoNn6;ME-LXC<j$X=0-<6^Uj2|Aw*
zX)JF&g^D$rNRu?0Od*9zG%BSsjmoKl_k~84G)1E-nyOJXP19&P%}{8jMm02x!*Z!c
zwKQ9!IW$+Jc{Ep{`GVF(8r9J|G+IDGg%)a5Pm45KEE?Gwy%Qq}EzxKxEz|H2KB>`i
zjA+zAjfA4Hhe^XgEFKZDmTELU1e!S1h!a69vQnc}g6?W+)@Y4jU@fiFXg!5AYM~7r
zsnTLLhU4s#;iN_z>0*sGQL9F6V)6>wtkD($Z6%HgmuR$&F4gEVLGyBf-cB5JvIjbL
zbhpQM?C#sq-8aaF$xoABo=k=ZP369ec4)Md!W!)&KD2x_bLQ5}o5Q@bh9VRqTztXv
z0X}uoDl^06f4Yo_?2+)`DkmY~v}4pVrnipLZ!?FQaH@yxG-rGf-zK2(am+E3P-Sgk
zBeGc$f0}EPSSVKhzG#@w-&!+eiq~%DM21hS#6Ubg*XHe?5pz-%U$k!^9OrW_Fy8W<
zU6r^5Vvw^8GjkHDfVpxuv)?$7Omc>1<}?M>ZoZwR0-UamCr@tLf+FGT6z;BY);AE{
z&_S5$=F6hxCSy%uFI72t+9IYINh{}obuQM&OFxZ6bBmSuH5#&+66LW(%f<1rJkmX2
zALVPtVZ<el#oE~zH?xi|)R^Njg|@Z~c5F{#d6ceje+$QaLmak*M;riz(b{#qLgwr?
zeR8{<$i>pzxs}2~oA#?2M^Z})kxbSaIgPNt7|x8EQS0n3PAb>}z2RiEt%oqpqH2t5
z?@IP0dTJYupV9QDvE{t|z3~`}Gp_M3a|z@qR5)QnG{re@!aVcGn|k&{u~<%es-5Jy
zg35}X0i)0vwWG%ILvtK!Bf#XE$H@`5Sn?ZY=5uG9MCNS%&c;}VaHz1~r+Q3&2s6j`
zcr*HNMU+f&fwGwkJCR9oM$@vqZS$t(>vn8wTE2-e>upc*vC~;pAB(y+%F$72+|aV6
zX;T}a`t3Mq?25MUZs^%>uC6q$ZfacH#E1U$w_Vshix>5`Y}nx}$9b2iuB<d}Je!Y-
zIgY#d!o9tGA`;%l*Ig;5bqovZR<CexXvgYVt!>LUwKcb_vUJHQq+pDFaeOac<EG-U
zH6iVaA|2(hEd1IIQS3B?`EEBd%B<$|aS~5|>;MPG%!uL6=`hLK7aQN)Glk=9{ARI5
zCWw8^)w4*U&7r~S=H?aSEX?$>Y_D3sp`~p#VbbWhZwi~%Xttv{YrNx?Tbr8Ja&#GU
z+=-yG**NkvlX1J!9d&|PDizGDMkqHdk+zaaJJV)$#qw<&SqFN#?u}XrKtq@vpq+JQ
zYux1z?m8yDm5n`Vm_$@U>LCBEUmsy7t27m5L_YS4J>gWX9X?kYO+F0Rw~P#5*qyL;
zJWHGpm2ut5QIsH#GQO4C4#K<ma>&EKoJsRD%&l7f<vbeR=}&?lV?e?#e)<e#KH3@9
z%mIiX$}K_%I{7IkxA16*e={a}?}pd&u>3GLWP?C9{{n^Zq6i9fgHWM4*doN!(1jS2
z>NaMP!r*Sic@Wdi%i^iic+8v`dD1b+5=P)zKO@g;!!0xNd^TL~$x~{Eq22~%1R31p
zH+r5zX1!PU%EzEdcnVp0+0F!?8$H26D{gd-gI3+>TnC-uM&~(bzZ;$Jpfla*0tc<R
z(E%Ghg2G`G)n&OmgLY?qwi~TG=m~Cgv4hTWqbEA(-0{(QZuBH)biNxs*+CcRK0Q;{
zMi8oJl^#P0p+2Cq7^Q^U5E4)s3EkHh>V<jPI-9Iq#?~Weep)kv3f;$#VN~7$pYChX
zeKmPghEXNY9l_MPfV){;SEy%<VA?RI=Y+Zfft__l0SB|QF6d%zCeItejCx(y^JW@+
z4x^^Nm|L@)*2L_ElLEmU?H;_Kt4C2gjM;|wJaZIthA~&q<<{-UJ&Jk5n6Kv;eFf8*
zqL&A-qg}Lc(h=lZh&mHt4K6SScjqa3h5;$^5oFrD*M)RnAT)w^)R%k~3${Ipg?e#b
zy&>{2771vPUSc3TbH^aO0x^um^(8_sy~NZb!|x1E8o?4vt=``Xv4(K(D6wv`c$;8w
z)Ep=jk~cU@*ElTj2AW~Fbe|hNR(kJ2m#S{VS=~F2qR!UjZQf0zRdvL>T=2KlQafpu
zGVG-t(M=Xyx-b!rE<$?9KZ0eflafG|XXjM{F14LVFEzyV=_R8)Yk6InV~(KERy<I)
zv#wnC2Fi6N)=*!eR~$nl;VuOAio6xJ(-_{@bOfI4g_Uw$mEpR2vFX2uQRMd4sh*v6
zRYy>u7u&qBLknD>ialLSF3w@kUsX3XP!*UOtkm;Iu$o=UGhL{q+4jc2)u>`n=p5QH
zwUt&*AT*3M>>-XOO6=A35<?U7{zXEpHX$JIy)k<&5HvMaI#$54K$#(6nO<zLUaprq
zsw^E>l@)=qKzXpj)_`0sG_cmzz>r>S*q7~mPN{r)=sXzxXM8Znwzf=LRRk&wQ7ZIe
zeWHn~3{(UvgJm|a(iMW&b+!{L9Cg;$g#w}5q2ws%Z8dvUW3xGq%?_QT20{_`=$86Y
zz0{Gu%pR|oS>9c0NiQ5MU^t{5RqqtO7O<V&j+^Z0ML9~`v|zbj?ii?id;^VD%#^?s
zLoriW$g04UKvmj$)Gai!!PbcHJpIiUX|xJBRO%cmr`DAON^+Fmx>ELmQe%gg>174j
zC^W<DJDRDm$>@Bda3J&P<!;Rc0y)aP|6C!J=M-13bTm~tuBNJ3A=Rvq>R^@aBG@Jr
zvdMPmwdRI0Ej8vi6J{}O!p`oj6dHG>Nn^r(UaPKu7Hxc<Y#zZDk;HjK4km5F#~BWB
z0#||{N->4=z*#8ATvTEys;~vs*n{afgqb+ZJx4Jc&vNh2FdwH-M+I0wGf+<rSWMfn
zgnF@zu0{jhg%$K5n&|6TN#DaNdI`<+3f9o8XrVW;QBtr;Dngr7i7nCsTq>=^Wl|fq
zOIxv1iX$w25WA$?5Rs0cLwW+8((~w&UPMgJLAN{!ad{T@$c;$Im!n7i0Q%%x&@bPI
zlst?9`DyHxzmEg*FL8xu65j2p#CtrmanQ32@AWj|{hm#@(sMZuc{*^Frw<?S+=#0^
zH{*kz`|%;qaa`kh4%d0Ujq5!x;0Di6@KMjJxY6?#Zt@at_SWMT?;70dJ%GdBD{-gy
z2HfR6j8AwU#@*h>Fywt4_j*5v`@BEJ{odE`fcGRG@_Fz{Uk)DjmEsX!1wQSYiN|~k
z@fqI=Jnrkj6TW>I_FaJ|eFt&O_hB6O-Ga~g9>5oTpTZY?pTSeUC-G(98~BPM;b|os
z&nO{$RVm|F-81<$&0;*KEXDK627FW5j&CUk@g3y`d{?;%FDSR-`^p`7QF#zQP>$nA
z%A5GHO8AMY;$=0D-&arK*UZ)UnYsW!R~O+|>Pq}tU5{7Pjrgs)6R)ZX{7yZH*VIG!
zy?QnNpgxE{s*m7L>T&!<eGadyFX9dL75r8GGrxGw=U2|<IFT`%-!^kWAbl6B+4dUy
zP6CB&y$$H$JU+xWT!~)vp@c2-JdzBB*gnso-@whrF{BtOWgFds0iIFDR=N^<87gO6
z?KkLEu*J4uAGa#mZmk&P-YT|K77j2pmF@I9{1-zZw$@_?y%M(3Mq_R%TWYB>qm1oT
ziz@_WwpNxwuYzrLqrppvEq1jzm+jPQ&Sh)OF~*g#%}Na_6>PCAgGwda>jd5{)@5rw
zj`s+O*k(s?P)Nj<J8aM^V>_)g=#{gzrkm@s&2)p_6t<X2uZr#UWrIqHt#%CWWy&RN
zyQ6p?L#1rN2k?HTT*h|1%iy`3t@$xyjS9A%xke>haFI!w?U!q;R>f8{*QjROl^eW-
zL>XmQT?}2xcH^6%j48bH`?%Z+X6U$zAsJILH1Lk&__0*|3+w2ET!d{=e~b??&WAnf
z)A%q$3J&oq*D$2wuzEADWhetjnVahv^5a>x3)eH0$^LgSKEjZOQ|f%&z_MjgfjSu<
zWn4DRP<<>@A0|+P@<+B!A984$@&k@qeaNL=<x9AUp**@;c?dT%luvglH?r^ap@800
z7UEW>7myTXI+q$T_QWEk7`HQ2BvmR|Y>^m((gNS#aR<w*ODlb^;ZB}gEVcPwX07&N
zqO{fbBYc8=Z4&P0NZA3u<<~<fv^;VM6_$Suq15sghAcY|q1>{@5GpNw4{^j5`o0oF
ztYuS=_rPm$GQ_^X^)AP_+S8b;;9m3p3>`$Fg8x=<pMz6yzYDeoGKLG~bi)N70p3Do
z?irSC@_$5%_|IX4%lMqEiL2-YHs+o{S15EEdz?j2W1TT{nS2V>GQXKS!w1cUUHlZT
z69S*YLS~6hqKcNuXV}><^eXdBp-y5cuOs9smgx+NFYr1iF^Nti<|uITNi24+mw$oR
zJHs2X;sQDYGcF8n`5#cgd4jM@NEjt>ftf#vO@?mX;(hc0?@tL2GQ{ss%_|~xKS!rZ
zPIf#qT$R3e<~i<rJV&v01eeq+t^w)09My$QU*%-Du<5%HzY9C|#wOF%m%gyk_&z{2
z(o*w2fU6^Mmr<8xrO3L+DYh5oZL=!<Y~3U7NWAtPi8uREJv)$T)wvURj(J<6n{~aS
zXV-gluUT2<WG~FE;S&9RX%i=%Orp9jKag)E?))3b+F6&+c)l&Gt}6%>h;~6BpKIZ|
zK%hYU6wVA7l|w^)(M+@YYp4(EMOHfcHK=))9>D|$!FO|JeY{ZDgJTETi1eU|d<~K%
zu0bZ-@_SwK8`mI{4Me)S)lGy`Ax#eI!HKurjtyoZZYk+7rm$GHV$8CQOR_*taH2@A
zS1-&xLQ4#_4&yRWtc~ia97F4VeX=ls&o1&)ra=UfFRc#q6^c)cm}(Ky%_U0o$zwR+
zvN*j?d9Wl{-p-8RiF2@O(cuv{o@0a~4EoMu$@`zM#MdBWcsF&FX6aUDX<T<Q-KSt?
zpg>fd4dNDXtRvWnv?CPCe0L}GYkT=&zH}LDz~B)C&f<%&Zdj*<mQ{nfk8*r4svfH6
zYiZyNXBt2S@hdKpxnA+&QjS}_l!0q06ZcRSj?)CZL^=2k<>FPYb>5%=`KXZm{Jls%
ze{506ABXVgA^ago3C-XSL}u~#As0~vE#dD&nrI5G<DOQU%AZSAQzuQMYxzTw$M_?W
z<2>?p{ygL)&6PBoFNNqLX$I9vv*;bt0$Lz7(L!l8EtW2!B~lkHmG;vz>3y_Zx}F-P
zyJ>~=2sKHM(@N<{S|vS8tECsIS^6QZm0qKD(wnqiIzb!cOxh?H(8Y2YwaW9TO<qQu
z<yEvrUPD{u%jpt1M%(2$?T`m(r+k3I^1G>BK131u8j8v{QHOk-I_1w(m;5}%<X_Nk
z`E}akA?gv?Jw1&YDa1LX$h<?+0tb2@=9!tdbUoLO4|CR3BHfJwJi_D3q(?X_{1oHL
zrDu7Dk)cbkF(i6Ja)CWpF0<##^X$3uGJ7speAZm5k{a<S&&_8o&A_J_Dq#61bI#8>
zAGJz_oGWwAN82S0pW*zjh&m;SGxG$3Y>Aig1oNV^Jw`Ch&_uS%qeg8qSsvhg)u1e2
z!?lN?S0LZSuN?%HfP5UQjJbvK=dr@jK~S79cJ|DW$R^pf7!vt0zy4t8Nq#%Qi4sF1
zkM<x-{+p3&dQl<&+{&J3$uDxIFS6$q@>536tm0DnAtPtbK(G99BgggQT6w>bDYKW#
zyNpa(!*O|yQDbG{CAkL2nMyX^kS7@Rzy!*d{%ll7IaDb9!N_NGjeK@Kyq1239Q_O-
zXh}Q7=e6MY4kJ%B<++FD;p~(`C_2MR&$2TIPDDTJoceA+<O1L;fK!+)z>}OA<KEM}
z??m#{jNo|@uo4QMV<(>X0c#C%L0SBs!XcS|^b<&wm7PG#8BVeD{x#B^J)Gq7g40x9
c?LL!etxTLPYyUbaD;xP7`@!dpyyOf200zi)4*&oF

literal 8243
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

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 d065bc1cd51d00e67cb53ce3eff1d542c5a32a02..73307daadff87e7b17a5c49fa34f3e15caebddbf 100644
GIT binary patch
delta 651
zcmZvZO=we55QWbfUy{Z)O--V{7fbTew1`&SD8aUB!BnZ@PpZ~J7yb|z(V$2zXf}pY
z!D<^s9tax$TB}V#up)>HH@XsBxOU@0sav5tS8?*v?7WN1H#3}>Gxz=+{5`l7jQQ8Y
z0~?Sxjv2epug(?QbUw$by-Q}Kr+ER3mgfT!mZ8^sbd+(yGHY=y>BfDQr<UnTMJ?0v
zDj4USzws^(IdR(z@3xHpRh`TBpW$WpaD~0BvQNC+BYy6c5cf%({nEkx(#^D_I3Q^r
zkPHvX2oK9Bk4TnBCC6iuXGX?2Bn6(3NuHDnPswZNZDM0_8y+HyD3_7IBc)ATK?G$?
zqn%aw@K`A(Aq3oNRJyUMkW@n<>4riw4F$^lh$q@FfOnk7Q>9jX;sZQW3gQdz;ki;<
z5#Kn4S;cku&YPG+4k7&FI9@1)*~H_RR|^qt=T^K_+Q1YOxP&}R7VrbFRBK5Vhw9^`
zfSvA;R++>Ww_i{yFx)O}wZFp|oP{2x+bHHh7sqf7;?e>tSc8Df;f@Y5kdzsWD|xU(
zCa|dF#en2-UCD=08O9BzCR~+%Oepy=C7W?kZLP($bmFd>ZpMsG+@(G0OO_f-wxfjb
fs?(A_Ox;zfZpt~IyyY7)t14`9W|Owl(s}wH7y5=T

delta 654
zcmY+B&1(};6vfZEPMXG&Cb2<hq74&6gb2Eb5{y*?TBYjvQL9}D8t{Yq0aCQZD##!d
zT8&v~Hri;dn%erY5CYPzE8V%aO9L*Y|3J|@6SMFw9=~@l=brQ4`!(=$;8P?SiXi|S
zkPlTe`IuiD?~@z2>!TSjbS+@s3M?UI8M=MO<{B<org!#={<&ZUyh<jYuuQ8%q3YNf
zo~Wj5GnTiE|9cI`j?-<jz!mQ1D*MFX9tm=<M7d9TSrnW5CCdYnW4{!6P#hkTAs&%o
zI#S{>xy0i#!jp1?gEG!j;&MppJS~eH#yNmv$Z!T>JjF#MxQwlM=2H_X%qVT-ii<dE
zC}R^>5yW$)q(oKXwG)zUOC;BpNU^ODr>#JZOL(D*FdCf0tWr0=@CjZjMevPf%qd0j
zos)Q_6vGeR#cN!FyADl`;*DYtJ9!j!jS%NHZo$0Ldgj@SYq$=Rcd(4NDz>DA!!0`*
z#}415TU=!Qff1?0@TWw*PsDkYpi5~=J?PU-+=BSD;9?PL5SCdyP!j`bnZ}q>0Ndpr
z-YIpUUq*0SDTuQ&hzX@mj7lHwD}^vEX<XG<Yf%;(4>fcb9;xF_ozc2w1?@{#(DN^7
bMc>5>6`De&m8yC<JsCJ-{z0z#J3a9i?TUc;

diff --git a/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class b/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class
index fb918dd73cda94cae542bf3f6faf462749df5668..a29f0c8ec22f485b5d41871f32b1cb6033ee64cb 100644
GIT binary patch
delta 729
zcmX|;OGuPa7>3_>=0E3G{}~+(t67Mc*+@2)Ev%$WBn!q8Q=>#pB^4FLunURAEW9ON
zl76BZOuHBaLc|O+jf*tXE@qpAR&9h9f#AYTpsUVI)`4?)&Ue1|`4(rTX}$4vcUo*F
z1a<&=N1!(?M2og)9#8*avHl7;_m+?k&E||6y9h((#XD`u(hp&-WV94;!72Qx3c(YC
z_6W1?FsgHnWWxvDq30Uzq;ny}Sr6ygoHj>HveD2NMopew84NALXU$jp2KQhqBDwre
z68@hu4mgc4YPC9Z$Th>*KvAa4;?-7}udVZ>w#fn^StwjQC31OM6!MIyrbjfhSa?|?
z##kzRJTInLCZ<^~f~*j8ydai%QLM32Y_duUR?Ae@$}HB&LSB*OY>@SAl<jPiU2Ks9
zY?b%fCWCC33+#|T>AWg8*r_M-nx4uVdI4|hCA_7#vD?(LHoShk#RC}HDkd?DVc4{F
z+`}71c5M^=m{AljB)TxCC_%Vz34TQm;ls;l!VpuKKv-F9Vp^T=)V7NtMz*ta=s_@=
zT~d~a*&)`pEs0)PkKNIt5&28Z<2}?;w4fRprBOweC@m_oLg=mdp!zf<={5MMY62O$
z2cOhniKF@vd{(5RNZ*eo^%{dRJq2GB#iCYsU|CTdd}_>2B>WZ6<Ey$Valqm(rL_-<
z<~MhW*_nOJI*z0$FK2J%^uk~tcCjCOIe;AAK|Tjj%pp{87?m8sb&jHkchS!=jM5DJ
kKG?*xaTR;4ViQQ`Bo6TjPVgx_e1---SFJAsw{yPp4<v!DumAu6

delta 770
zcmZ{hOGuPa7>3_>#&eG2Kck~*IfB&ScqzuIaUm&X5#7*AF}2iG3N@`L3hgE#q*+#8
zrk{wcw41ps9Gb>O7q#q4k<==PHf^F7u7V)wjMlOP=kR>r`QGO&&X0!a#(QmUTMq>0
z0qR4r(;cEkEH+o9eX>Mt3c5U7$lqpDdX1wz44EJ6vM0$=l$+D(%?mAAE-{Mg5DG(x
zx{R6ZFm~h`NyY$_Q{@__Gd0a`3&F@v*c?KPH77wAF(OBILU82UU3O=5l2LyujGBCh
z_8L+3VN{uI8Qo5LBj(zF=5G;|`~ND#>oUTqGcz*B7!&-GnQ3Vki7XIqt`c6Z7I|DF
zs<>7(bG>Ng2GPetafL-<lqF)4rIOq#Z7h>cmdg}YNDsG3A1h@st7R=~<Q~?_PVSWb
z+$BfYAj52wQ`{}5*(5)6ul&w^@)!536dq7nJg7F(bx2jPMIC0V>f{kM%%dvE<LW(6
zm_tiu+P~r<F2N9q7{nu-hh4Z4zynPV;YAn5G{uTM9K&NxaiR*_F{;Tai953iL)vsU
ztSxrw)aMhu9Wn(yb6M#@2ku9*(x)vEvr`uTwZyl}DJ0J}jmW2C923w>)1)5cEcI%#
z%+ga$RtWVD&-7dr64V5ybWb2%-NkeLu*7n86)!X?tW$k>sc)lEs!rmSCL8KhD_(1g
z!GL~dKH}!Y<9MS>Ee>Aume3kTycwUJYC3#**0)G71KEqrX5UYL7Yv@p0-k|~-SG1)
z3V04h>_HiOQOQ2Eupb=^po<sK%ZtIl(nh)mb!<q-t|N^%u#7jclDAOE+o<QT9vulL
H`#<szJEXDn

diff --git a/target/test-classes/TestByIntervalPayMentWay.class b/target/test-classes/TestByIntervalPayMentWay.class
new file mode 100644
index 0000000000000000000000000000000000000000..e2ce793cbb4b76b730c98c8ca212b880f6631c22
GIT binary patch
literal 3474
zcmeHKTT|Os5MF_ajd5-!kV~6{UQNJ8k}qJJh&BnikeXZy2}#pVMwX6*jBH^^faOjf
z`qYO$_jh#KX>)02I(_c{NT*Nz37zg9$%z?A`q)mVT%>dMe7on{J!j3wuYdmZGXNCf
z(<F?8m;?#r1mqJ?7(rtx0ka91OF%gel_U%kpbGN@Jx^054hzHZ0eqN*3ve+3lX19|
zgfzj@uo#ESakwJDf%8_&@)racoIH0|fY>ERX966qSuJ*Bt6696s#>?vlCC+LYTs2|
zi{_Cr=C50x0H<oJ%=0e>OD&(d+p2v_4VGEUUsHp5jM!AImH^|E4{8l{TNQ1!Wr{1l
zYqiXIzN6}z7-MvwWdVjZRab2iAMU&5Tei5YZc^BW=U~|M-k`W<^0o1r<}^jqaZH<u
zWD>991ASB5n2T>Yt(xWe0vzcJP8LLr@6I;Z>}6c)!y=LMd$;ei+^jd4=Fcx+z^i?J
zv`6IFOX&4+qG~PhNXZpv%hlKwi%#YAs|r6u^-95UI1z`dDYynpc+^`SbC+}h21<oE
zTu;GAP!nLpWj0eiwy63Ta5OLF3puHrlS>nlROLTH{OE(vn|LpD)mQOt85VODIXl7h
zpwsrciaaAp*@+%Pa~XzmeJq-S=7#BMvQpv@8cPv8Xs<K9Yj(OyCPSg>rpI*6HasOG
zaRbIyGP5|e8=7m{f#KOZ2o4uFd{2vlHZ|q9AHV+n+i#vf{o(nSUu7qjZ!TWGb7yH$
z(dA;fGCL>bm?q1)V#O%s%5&w}T&b*93<GVmb4GTe8-x@rUCGF0+^-SrbTpgOqPzRT
z&h(9-tsy^7&oGE;p70H~zTRbeD|Cqp6_o*FA_TDwzS^jxK_)NExT9;Goqe2qtH}^n
zs+RKA5>>#{)~Wh+yNg>=JYDO08yzeGaS0k-q>cl_ahr4s#5gYz&h6^$U5<v1Cm{Do
z>3&FzA2UU2M<F?EPRYzsRC1XOkHYIV%rI$gttgpF4^dV!RJ^w5;<4c^l5<iiC-dYf
zKtahAaC!G7!3%|n@+&9jb9wUTar5CGE^BY$2g_2F9fc_=nNkl`R5C>zdrh7^({-#R
z-w(_1ux@o9VjbkNBuRxrfnQcU0;;^;4M`F<tn5bD>kw_aTSP#XFcM94=Bt*?Zvbt@
z*N_}PKt7>T@;y!Rmx<esN0*0tW4~};N=$G2ZNu=RJJX?iPncdo@NF3Z6(l@;EJ`sa
zVG)ZH@@%yvSLM0P7unagVgB#iP?q}oFzm_K^kH~Sc^}f*?e0U$8asmeFpBzrBmPSp
z5kLI?Lyg$$fB7G5#Lomcwx76&!*U94z|9ogg4-$h7*+&0^isOeU;a3(rr-|Tjl)_B
z?!kQlZc`-IGEs7gs_(OwuC_ELZmXe45gSfjTzBwONDWNZVlJ01qOWScrFr6hvMU9j
zzykqJyh<IQ=6R{bLX{%GnZAT@*hIagIkt@oh9nnCv}B9zTvNSuoCz>Cd9F{=L}nB^
z2VZ8(af6#%D6z_udu7pHOB9hS#7H{{aQ4--sGP_vg}g4ft{Tu>faANEy;wkQ36uGk
zY}F&V*#q&-xRC&c>ol)(@wm{>I1*rej9q5%%B-TwnctUpUxil!&u6G&2OX-#SQy4~
z#9JtWeT>c2CT>2;E4SM$Kzx%xHcH*GenwGwNI=K2Kv-nb=n<l)Dp6m<TQG+I5YX2E
zU~S+8K2PFI#J7O&p{d6pe8-nh;qw4Dj=&o@PK5w?6Heo77|y_1w2<>3FbG5VzV`$M
zYSZb#bnGb%4Z_-V`an7!4%3O{XE1#KF(hw1fstw~mpvJK1gS@G@E15#jeQS?X?|on
zee`7H{0!0vADw;#$B54$5T6+s!RJAU!67(|->2XxvPr{xFbY#}3@Vu31x%`jyw-4)
zco#!%FoDSfdalCT@D4IR4fF6WdJf=k0p5oU?lFZsOu{)tO(Aw1*FyX>;={EpS_H`9
I>Hy6A1wZr1H~;_u

literal 0
HcmV?d00001

diff --git a/target/test-classes/TestObj.class b/target/test-classes/TestObj.class
index fe5bf32a4a27a2e87a8495bcda30502475fc6efc..e7c84f6b5298a0dc86a071de31cde30a5e3bb2b7 100644
GIT binary patch
delta 513
zcmYL_$xa(V5Qe{=F`4nG1;#8f5FqRrm@s38C2R>>!fqfzh$Dv)oInDfxbO^U&Rlqb
z2t^`R4m<#PC4^FK3+QfD_5asjf0z0u{V#p+`26<)h}idNAn!56u*-;t&nFW`T>?Xf
z4h0XFe3~&LmvNT~k4dIHJ~Qny<1%aToWs1sm%Cz4sjtb2>c}_J<glPwWJ!@K1ck_9
zS+l}7&39H6RuE~{SWkYbTyaCQ$(F(s;g}y5{BXPqB0mV_IBaW*>^SUd_W1Fl3?}_>
z;uTDZQuC9Y-zjTEW$KRO(qddXh~v}4_~`s1xwe{<eS79gk$Ed^ot>6WF6bgFKVg=I
zLZ+A4ENE1+l3X+N2X$8|znA!~Le`R#yRHgop;b_tHa>`nX}%?eEqT6-wK<%%%cSn9
zNuKP1%eri)O#MBz#?!`lwu&ocq^DjyI_RN~fPUs=n|D4|y=a#jqMD{tI3>C^8NXZJ
X>=E8fQ)POE>8mJ}xF`nXZZY^D?SDX3

delta 441
zcmX|-$w~u35Qe{=L}xOzaZ5DryK##%S=_h8eOD9_k8=p3h=@kPlMj)z4-o_v4?cjt
zlUS3W-OXS1|Fv{=e}|q!2VXxQpFoB~n|k6lLkwGt*o-pfL&9R*7abGV#v&dfNy;K^
zk+GRz(q@Wjiy4zyleyAqOsV<ejp}@ApwVPOv&fPnm~vAYldLAkvSx)<h2ds2Ypg38
zFTDrPxi4H?Il0?g?{W9yu3)mE*<?#$OKm#gCguE-X(1-tnjLmc_B8t(`~{P#L^`Qn
zx{Og34xi@>%lX1-K7YOHJr>UbN5}L~Cr|a4fkMU<j0khYDzQ}~Z>Ul^92KlCi(#6?
z*OdgCi3tnQLaQ{16zhZ8I^9tFPR%P}zcfI!=mn!EgSf<5knNXui;jFq8|`9)%+f)p
dwCoe5OQMF%R=K32^or6~&Q$bE-hlW9gTHVvHI@JX

diff --git a/test/TestByIntervalPayMentWay.java b/test/TestByIntervalPayMentWay.java
new file mode 100644
index 0000000..633d36a
--- /dev/null
+++ b/test/TestByIntervalPayMentWay.java
@@ -0,0 +1,27 @@
+import com.engine.attendance.vacation.job.holidaygeneration.tactics.ByIntervalPayMentWay;
+import com.engine.attendance.vacation.job.holidaygeneration.tactics.BySchedulePaymentWay;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+
+public class TestByIntervalPayMentWay {
+    public static void main(String[] args) {
+        Map<String,Object> param = Maps.newHashMap();
+        param.put("userId","53");
+        param.put("releaseDate","2023-08-15 00:00:00");
+
+        String json = "[{modedatamodifier=1, edyxqsz=1.00, modedatacreatertype=0, jgsc1=5.00, jgsc0=1.00, yqhedzgxz='', edbgsedclfs='0', edyxq='6', ljcrglyfslwz='0', edktsc=5.00, mc=测试年假, MODEUUID=d1489670-ec11-49f5-8786-58a9ffc1167f, zyz='', id='18', jywxcl='', mainid='18', edkyqcs='', edfffs='2', 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='0', 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='2', 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='0', dataid='18', dqtqffts='2', xxz='0', modedatamodifydatetime='2024-01-04 16:51:17'}]";
+        Gson gson = new Gson();
+        List<Map<String,String>> vocationList = Lists.newArrayList();
+        vocationList = gson.fromJson(json, (Type) vocationList.getClass());
+        System.out.println(vocationList);
+
+
+        param.put("vocationList",vocationList);
+        new ByIntervalPayMentWay().compute(param);
+    }
+}
diff --git a/test/TestObj.java b/test/TestObj.java
index b967ef6..6f1a173 100644
--- a/test/TestObj.java
+++ b/test/TestObj.java
@@ -34,9 +34,9 @@ public class TestObj {
 //        System.out.println(DateUtil.getBetWeenMonths("2021-06-01","2022-07-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.getBetWeenYears("2023-12-15","2024-01-01"));
+        System.out.println(DateUtil.getBetWeenMonths("2023-07-16","2023-08-01"));
+
 //        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"));