From 2db8318e418738ef5224e4509429e5924cb312b4 Mon Sep 17 00:00:00 2001
From: liuliang <401809302@qq.com>
Date: Tue, 9 Jan 2024 16:01:18 +0800
Subject: [PATCH] liuliang

---
 .idea/workspace.xml                           |  94 ++-----
 log/sdk.log                                   | 107 ++++++++
 .../tactics/ByIntervalPayMentWay.java         | 248 ++++++++++++++++++
 .../tactics/BySchedulePaymentWay.java         |  49 +++-
 .../tactics/SinglePaymentInFullWay.java       |  24 +-
 .../vacation/util/VocationCommonUtil.java     |   2 +-
 .../tactics/ByIntervalPayMentWay.class        | Bin 943 -> 8243 bytes
 .../tactics/BySchedulePaymentWay.class        | Bin 9671 -> 10195 bytes
 .../tactics/SinglePaymentInFullWay.class      | Bin 9219 -> 9314 bytes
 .../vacation/util/VocationCommonUtil.class    | Bin 13133 -> 13138 bytes
 .../TestBySchedulePaymentWay.class            | Bin 3475 -> 3475 bytes
 target/test-classes/TestObj.class             | Bin 1149 -> 1181 bytes
 test/TestBySchedulePaymentWay.java            |   5 +-
 test/TestObj.java                             |  13 +-
 14 files changed, 434 insertions(+), 108 deletions(-)

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 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/hrm-attendance.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/api/attendance/vocation/VocationActionApi.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/AdjustStartingTimeEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/BalanceHandleEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/DelayTypeEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/QuotaChangeMethodEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/RemainderHandleEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/enums/StartingUnitEnum.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/VocationCmd.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/HolidayGenerationWay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/util/VocationCommonUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/web/VocationAction.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/test/TestBySchedulePaymentWay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/test/TestSinglePaymentFullWay.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/log/sdk.log" beforeDir="false" afterPath="$PROJECT_DIR$/log/sdk.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/vocationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/service/VocationService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/cmd/GetPersonDateBySuitOrganzation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceplan/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/README.md" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DbTools.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DbTools.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/weaver/formmode/customjavacode/modeexpand/DeleteCheckCalendar.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/weaver/formmode/customjavacode/modeexpand/DeleteCheckCalendar.class" 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/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" />
@@ -109,7 +60,7 @@
     <property name="ToolWindowRun.ShowToolbar" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File" value="PLAIN_TEXT" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../easyentry" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.0" />
@@ -133,22 +84,21 @@
     </key>
   </component>
   <component name="RunManager" selected="Application.TestObj">
-    <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" />
       </method>
     </configuration>
-    <configuration name="TestMergeAskForLeaveAndEvctionSchedule" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="TestMergeAskForLeaveAndEvctionSchedule" />
+    <configuration name="TestGetClockInPoint" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="TestGetClockInPoint" />
       <module name="hrm-attendance" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -171,10 +121,10 @@
     <recent_temporary>
       <list>
         <item itemvalue="Application.TestObj" />
-        <item itemvalue="Application.TestSinglePaymentFullWay" />
         <item itemvalue="Application.TestBySchedulePaymentWay" />
+        <item itemvalue="Application.TestBySchedulePaymentWay (1)" />
+        <item itemvalue="Application.TestSinglePaymentFullWay" />
         <item itemvalue="Application.TestGetClockInPoint" />
-        <item itemvalue="Application.TestMergeAskForLeaveAndEvctionSchedule" />
       </list>
     </recent_temporary>
   </component>
@@ -418,7 +368,9 @@
       <workItem from="1704527808201" duration="6902000" />
       <workItem from="1704605008241" duration="1460000" />
       <workItem from="1704624857172" duration="13062000" />
-      <workItem from="1704677723452" duration="30104000" />
+      <workItem from="1704677723452" duration="30230000" />
+      <workItem from="1704725663394" duration="16000" />
+      <workItem from="1704764236606" duration="17852000" />
     </task>
     <servers />
   </component>
@@ -466,16 +418,6 @@
           <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/SinglePaymentInFullWay.java</url>
-          <line>294</line>
-          <option name="timeStamp" value="91" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java</url>
-          <line>279</line>
-          <option name="timeStamp" value="93" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>
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<String, Object> 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<Map<String, Object>> vocationList = (List<Map<String, Object>>) 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<String, Object> 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<String, Object> insertHoliDayParam = VocationCommonUtil.getInsertHoliDayParam(vocationList.get(0), userId, qsrq, releaseDate);
+
+        List<Map<String,Object>> 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<String, Object> 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<String, Object> insertHoliDayParam,List<Map<String, Object>> 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<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd);
+            Map<String,Object> 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<String,Object> 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<Map<String,Object>> 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<String, Object> 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<String, Object> 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<Map<String,Object>> 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 10827bca826a0ce5479cd917d923258168adada1..4c2a01e3c29828f2692a6752a3033cb89ff61b48 100644
GIT binary patch
literal 8243
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

delta 318
zcmYjLI}!m=5bU=fV|~_d{r@r&i37+srIZ7xas-*c2}JK8N(od696;m_P9T&h{gzT2
zyqWIlo_=$h9;9}AU#<Wq=%!$!DQF4Wf{tFOr|Ya&o0XnffqvL?y>~)AkfH4&p?ls`
zzmnS}`mngC;4s8=imXC5W>@U)=nQovu#jXmGKf6Z%-4Vv(qxJ}%PRU_XzYyFXC$b(
zRD{gzRG0&z?~Xw}a@@*u$^(S3fFe!ihLF$LqyO#L|3NHE{j(HG2pCWXdcWh$sKQY-
LN~#gnBh>f+Ff|#q

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 31977e89954478f4eff4936c2899cb5ff84e1ea2..c825b042026b03c014c268325862894d023d4e6b 100644
GIT binary patch
literal 10195
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
VwkPh_JN1naG$B0r6rTCgKLNvD9DV=*

literal 9671
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
U=c_A__&(o^;7I-FEe((SAH@os`v3p{

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 3fdcbb5b3ffd3eacc6e25e7d7b265ed5b022acff..d065bc1cd51d00e67cb53ce3eff1d542c5a32a02 100644
GIT binary patch
literal 9314
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
E3(qVhYybcN

literal 9219
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
F{|}5HBS-)M

diff --git a/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class b/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class
index 24c35a174fc479a3e39defafd674ebe410657c3a..fb918dd73cda94cae542bf3f6faf462749df5668 100644
GIT binary patch
delta 28
jcmX?`b}4PcabA9r;?$hf<PwF<6rHrR;;hXVd23Vwu^<bF

delta 23
ecmcbVb~bIpab7O|;?$hf<PwF<l+D+8Yg7S!1PQGG

diff --git a/target/test-classes/TestBySchedulePaymentWay.class b/target/test-classes/TestBySchedulePaymentWay.class
index 2e0fc5fe67ec646355b1237f17ee36667e9d3ad1..82dc0b67c9fc048acd53dea3c1660a3d43535021 100644
GIT binary patch
delta 77
zcmbO%Jz07~ITO2~u7R1Zf#KvjrYbo@bsdG&l*)=iTXh2<Gbby#C_Se#tvIK=%2wTU
gvl#PAMkWK(%?DXBIXER4d>AAd!WpC{8}lXr0AyJe761SM

delta 57
zcmbO%Jz07~ITO3Fu7RPhk>%t%rmD#eY}|~7lY7`?HY+gCXPoT8ac*-j>s)qDaRwg-
N35IY6$;rmN2>{r{4?zF`

diff --git a/target/test-classes/TestObj.class b/target/test-classes/TestObj.class
index cec826fcfda66517ca9fc271e92483a3fca86232..fe5bf32a4a27a2e87a8495bcda30502475fc6efc 100644
GIT binary patch
delta 480
zcmX|+$xa(V5Qe`V8)iIe44BP8fUug)FkT1*upumF$4ErVg^NKW6cm93PNZBS@eDq5
z;mie)0^+~}@Dw}**F;p?g6>vT|4aX>{^wkT@=yOC9)UDFF7?D*1{rb~b{S#Rl(@r~
zA;)bz7l&Ag1WAXKL)vA6PcD;8IefO6wwbx!jH=aHg}Zz5^Yp;aegEMr^jH6^nBPAd
zJ1YDtXd*P&WHedk6v3pIOxw(BzObNKWJzIpY0WaZ(v^y4Ry3=uNun52aW5g~9ZU(Z
zS=Vf^X|tu-CjTZTlJQjH_C<}V+VG)YT=0wEeE)c<@cXQEZZ(&3f$UzL{MalDWrmX4
zC}>=|l3q1@hq^AyO;W4NWSC~T>xzLEqJl!S(k3D1@g+e5(zB)KfcNJHH=-l8_tg9)
zY@z~~s5S|MI<eN%PA9z#;1MGu+r)pYM2Pl5P>^Xl#HGa7PM4?_-NKt8Dol?sy=AAO
LPuPCBTMWDc8M-@o

delta 423
zcmXAl$xZ@65Qe{IafZo+#RYLg6h%RhVRJ=P+!gg?jENTy6TRp`c@Z*apTQ6hCLVkM
zU&bfUSPh*{Er0!gRad`;e$CeR-{%)l<-#IL#$tg*ldMIKC2jI11r0766fI0LAsk93
zWs`~}vYN#Ts|ITZ>)p$QQXAfbN@imW8f@Cs*-`|`PPuB(u-RtEW|yYI=TvR>*!SL4
z!a1-x<Vax&u~Kkq1*g<csuIaHIJP<A)Zomf#rb={msioqz1wcO?Q7S4x^eHGU%ZYl
z?p^sCw-MPyA0G;Nh}a>?isF^{VD1Ce?Ujec4)nk<BNE$v0&zwq3z1+<nrLx{0Dkc$
z@5k>vYPBD&juR9cm1>L$lBAiF|Ec%7rTPlSrGhXDOfn@C(u9RMEuB+>>zRFIMv&Pa
MQzJ?`=@sVx0rx*GlmGw#

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<String,Object> 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<Map<String,String>> 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"));