liuliang
/
hrm-attendance
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

liuliang

Browse Source
zm_dev
liuliang 1 year ago
parent 2db8318e41
commit 68b3e5579c
11 changed files with 301 additions and 44 deletions
Show Stats Download Patch File Download Diff File

45
.idea/workspace.xml
Unescape Escape View File

@ -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>

111
log/sdk.log
Unescape Escape View File

@ -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}]

140
src/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java
Unescape Escape View File

@ -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);
}

16
src/com/engine/attendance/vacation/util/VocationCommonUtil.java
Unescape Escape View File

@ -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);
}

BIN
target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class
View File

Binary file not shown.

BIN
target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class
View File

Binary file not shown.

BIN
target/test-classes/TestByIntervalPayMentWay.class
View File

Binary file not shown.

BIN
target/test-classes/TestObj.class
View File

Binary file not shown.

27
test/TestByIntervalPayMentWay.java
Unescape Escape View File

@ -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);
}
}

6
test/TestObj.java
Unescape Escape View File

@ -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"));

Write Preview
Loading…
Cancel
Save