修改加班计划bug 修改假期额度发放尾数不对的bug

.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s

@@ -1 +1 @@
-蝭鷉雐阩蘥⺄蔴詄鹒蝘鮢雈藂鎋醏衈羅闬蘟鉤豜鑌鵢鮚誦韄羆裗謃誣馷羍鈊鴅鋔蹃
魙<EFBFBD>鍆鎫蟶銅謞聕賩齵鈠鱵髙鱹蝲謢雥觺訶鸤腦轡襑隬關軼齔颷蒢蒚赨頟<EFBFBD>Y餤鶼蒤腣臷軻裌螿鳷萓鋄輀譝蔰興蝍鞽鳻<EFBFBD>Y蟈芓餜萕薟鸘薶謨
輝駓鈝蓋齶髙饅鉿躽纜聓鴝纙髕鎨衱鈛薙頩赲臰黋霿踋靁衉<EFBFBD>Y閇齩鋛閟錺踥謔<EFBFBD>r飗蝦鄋髎飊謕飉髆鈙纑聀觭蝧蛈鉸蝭苪靦鹴蓆蘹謜蛺
藥
蛷
鷳
貜
袕
顜
膸
菒
韻
鯈
翍
顜
陳
鷰
賺
諒
饚
謶
虗
諒
蕫
驆
鲝
迱
鋶
袔
饙
鼛
貜
蕭
藫
翋
顝
陹
鶔
諒
膸
鐞
鼝
鄭
釕
鷱
鶑
輲
鄴
蕩
陯
虓
驉
陸
釓
鈵
袗
饚
鴱
鼛
飴
菗
茟
飹
聨
藨
輴
鈵
顝
訍
蓭
迯
麗
麖
謸
鐝
鎻
雿
鴲
蹛
迵
謴
鰩
趷
鋹
缾
趯
聨
銖
魨
謳
袕
菒
鄲
鞇
訊
顝
陱
髲
茠
該
脨
藨
鶔
蕭
陳
艀
辸<EFBFBD>t蕑駑謝醰貀鷚鵺鴛蕏誼飝齰鰔膗顅関顅閤⺧襩蚼説餵黫踡趂齣胟騤騦鹙駃鄊貇韢鈣脈<EFBFBD>賬<EFBFBD>雫<EFBFBD>~䙌苺
<EFBFBD>鎪鱸<EFBFBD>賫<EFBFBD><EFBFBD>䙡虀舿詞鱺<EFBFBD>閪<EFBFBD>羱<EFBFBD>髜膤<EFBFBD>駝
辀袻翷跮繫釳鏜隡隡頜覰鐼隡頜鏜鐼闙頜鍹鐼馣銴錕闗繩罦肑<EFBFBD>J錕鉑釱螸跭鍷鏚鏚錕镵錕錕镴繨鍶覭錕镵鍷錕鍷銴鏚鏚蠰銴錕跭諮罦鐹銴錕鐺鉑螸鉑銴鉑镵鏚鍷錕繩腏蘒覭釱鉑鐺鏚錕銴鏚錕鏚襆鍷鏚隞<EFBFBD>I覬訩錕鍷鏚銴螸鍷鍷鍷銴闗銴譑跩繨鍶﨣銴銴銴銴
+аyГ~цЭ|дй~Й~хд|И}ф─
Л~ш}Т~М|юй~с}С}ю─
Я}У}Ь~к~Х}Н~г}ЭЖ|б}О}Ъ┌
рqчhаjЖkЛjВhТjгiлjфkзiУhЭlЩkуoжpжxЯuЭtЧvВvтwЛvа{иxяyТxЙvЮxЦvБyиxрzпwЧvзxа▌
Ы▒
Ч▓
ш░
С⌠
ж░
М░
Ч▒
С▌
ъ▐
м▌
Ж▐
С▒
Ъ▐
з░
н▌
Н▐
Ш░
з▐
Э▄
д▄
Д▒
о░
Щ▒
Ъ▀
Д⌠
в░
к▐
д█
Щ▌
Р▐
ы▒
щ░
ч▒
А░
я▐
П▌
Ь░
э░
я▒
Ю▓
ч▌
ц▒
П▒
Г▓
З▌
У█
Ъ░
л▌
о▐
щ▐
б▐
Э█
х■
д░
Ъ█
т▐
з▌
Ж▓
Т▌
Н▐
Б▒
У▐
щ█
П▒
с░
Щ▌
л░
э⌠
р▐
р▌
Ц▓
ь░
к▓
м▐
И█
п█
Й▌
П▌
Р▒
ж░
п▐
А▐
л█
и▒
Ш▓
Ф█
м▄
ю░
м▌
Ш▌
д▐
ш░
ж▌
и▌
И▐
Ж▐
ъ▐
В▌
н▒
л▐
О▐
Й█
Н└
иwбsСsЪvцsЕwаtПsщyАlГtДoфsшqлlЬqЦpЗrКlыsЖsвuрsХmхoьqЛrщlйjНZК\т^Й\ФZоVфZХXШ\РVИhбwчxкzБyп{Шzб|ш{оxОxЙ|фzд|яwи{ЗvБyК|ЦVеZюUаYфSТYхXе\цXэaцcвeщ_ЮWхWц^бTмRюTЫTПZсWж[ъTЕ]ы[ЪWТRДWгVоZГZЧUЮYСQсXЮWБYЦ[кZшgО~В~ыzю~л{РzвyК{Бxи~ц|М{ъ~тж|Ф}к~н}ы│
чaчdВ]вhп]вaь^ГaК`гaй^ж_Ш]С]И]в^Т^в^и]Т]Х`ЯkКgшgюgЩgюhШcТ]жWЬkшiцqжh

.idea/workspace.xml

@@ -17,117 +17,30 @@
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/WEB-INF/sqllog/ecologysql" beforeDir="false" afterPath="$PROJECT_DIR$/WEB-INF/sqllog/ecologysql" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/log/sdk.log" beforeDir="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/jucailinkq/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetEvectionCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetEvectionCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/AbsenteeismItemCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/AbsenteeismItemCmd.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/ForgetClockInService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/ForgetClockInService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/ComputeAttendanceDurationCmd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd$1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetAskForLeaveCmd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetEvectionCmd$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetEvectionCmd$1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/jucailinkq/common/util/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/jucailinkq/common/util/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetEvectionCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetEvectionCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/AdjustByWorkOverTimeCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/MergeApairClockPoint.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/AbsenteeismItemCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/AbsenteeismItemCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/BeAwayItemCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/BeAwayItemCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/BeLateItemCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/BeLateItemCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/ForGetClockItemCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/ForGetClockItemCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/LeaveEarlyItemCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/LeaveEarlyItemCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/VacationItemCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/VacationItemCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/WorkOvertimeItemCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/item/WorkOvertimeItemCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/GetOvertimeDurationCmd.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/job/AttendanceAnalysisJob.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/ForgetClockInService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/ForgetClockInService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AllowanceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AskForLeaveServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ComprehensiveWorkingHourServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ComprehensiveWorkingHourServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/EvectionServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ShiftServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/UtilServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/UtilServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/WorkOverTimeServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/AttendanceAnalysisWrapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/service/impl/SchedulingResultsServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper$1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceanalysis/wrapper/UpdateAttendanceResultWrapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceplan/cmd/GetAttendanceItemsByPersonDataCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceplan/cmd/GetWorkHoursItemByPersonCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/attendanceplan/cmd/GetWorkHoursItemByPersonCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/ImportAndExport/web/ExcelController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/ImportAndExport/web/ExcelController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/cmd/GenerateScheduleCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/cmd/GenerateScheduleCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/cmd/GetDatatableRecurrenceCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/commonutil/PersongroupCommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/SchedulingJob.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/SchedulingJob.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/tactics/DayRegularScheduling.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/tactics/MonthRegularScheduling.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/tactics/WeekRegularScheduling.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/job/scheduling/tactics/YearRegularScheduling.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/cmd/HandleOverdueVocationCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/cmd/HandleOverdueVocationCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/cmd/VocationCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/cmd/VocationCmd.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/service/impl/VocationServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/service/impl/VocationServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/EliminationsAskForLeaveAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/EliminationsAskForLeaveAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/EliminationsEvctionCheckAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/EliminationsEvctionCheckAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/EvctionCheckAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/EvctionCheckAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/MakeUpClockInAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/MakeUpClockInAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/OvertimePlanCheckAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/OvertimePlanCheckAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/OvertimeResultCheckAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/OvertimeResultCheckAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/RevokeLeaveAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/RevokeLeaveAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/askforleave/AskForLeaveWorkFlowArchivingAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/askforleave/AskForLeaveWorkFlowArchivingAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowArchivingAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowArchivingAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/cmd/GetEliminationsEvctionListCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/cmd/GetEliminationsEvctionListCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/cmd/GetRestDayIntervalCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/cmd/GetRestDayIntervalCmd.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/service/impl/AllowanceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/service/impl/AllowanceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/attendance/workflow/service/impl/AskForLeaveServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/cmd/GetPersonDateBySuitOrganzation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/cmd/GetPersonDateBySuitOrganzation.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/util/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/util/CommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/util/DbTools.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/util/DbTools.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/util/Utils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/jucailinkq/common/util/Utils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/test-classes/vocation/Test1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/vocation/Test1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$10.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$10.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/vocation/Test1.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/vocation/Test1.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$11.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$11.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$12.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$12.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$13.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$13.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$14.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$14.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$15.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$15.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$16.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$16.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$2.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$3.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$4.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$5.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$5.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$6.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$6.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$7.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$7.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$8.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$8.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test$9.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test$9.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/Test.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Test.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/TestAttendanceAllowance/Test.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestAttendanceAllowance/Test.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestGetClockInPoint.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/TestMergeAskForLeaveAndEvctionSchedule.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestMergeAskForLeaveAndEvctionSchedule.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$/target/test-classes/Tset_sy.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/Tset_sy.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/shuju/Test.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/shuju/Test.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/workflow/UpdateAttendanceResultWrapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/workflow/UpdateAttendanceResultWrapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/Test.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -227,35 +140,35 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestSchedulingResultsAction.test1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="Test1.test1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="hrm-attendance" />
       <shortenClasspath name="MANIFEST" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="web.*" />
+          <option name="PATTERN" value="vocation.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="web" />
+      <option name="PACKAGE_NAME" value="vocation" />
-      <option name="MAIN_CLASS_NAME" value="web.TestSchedulingResultsAction" />
+      <option name="MAIN_CLASS_NAME" value="vocation.Test1" />
       <option name="METHOD_NAME" value="test1" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestSchedulingResultsAction.testquery" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="Test1.test3" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="hrm-attendance" />
       <shortenClasspath name="MANIFEST" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="web.*" />
+          <option name="PATTERN" value="vocation.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="web" />
+      <option name="PACKAGE_NAME" value="vocation" />
-      <option name="MAIN_CLASS_NAME" value="web.TestSchedulingResultsAction" />
+      <option name="MAIN_CLASS_NAME" value="vocation.Test1" />
-      <option name="METHOD_NAME" value="testquery" />
+      <option name="METHOD_NAME" value="test3" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -305,10 +218,10 @@
     <recent_temporary>
       <list>
         <item itemvalue="JUnit.Test.testAnalysis" />
+        <item itemvalue="JUnit.Test1.test1" />
+        <item itemvalue="JUnit.Test1.test3" />
         <item itemvalue="Application.Test" />
         <item itemvalue="JUnit.Test.testjob" />
-        <item itemvalue="JUnit.TestSchedulingResultsAction.testquery" />
-        <item itemvalue="JUnit.TestSchedulingResultsAction.test1" />
       </list>
     </recent_temporary>
   </component>
@@ -828,7 +741,10 @@
       <workItem from="1720527036200" duration="6471000" />
       <workItem from="1720534639000" duration="336000" />
       <workItem from="1720575209924" duration="8590000" />
-      <workItem from="1720590109223" duration="1383000" />
+      <workItem from="1720590109223" duration="14820000" />
+      <workItem from="1720662652644" duration="4776000" />
+      <workItem from="1720675844486" duration="17476000" />
+      <workItem from="1720747895355" duration="7141000" />
     </task>
     <servers />
   </component>
@@ -877,21 +793,21 @@
           <line>221</line>
           <option name="timeStamp" value="108" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/jucailinkq/common/util/DateUtil.java</url>
-          <line>175</line>
-          <option name="timeStamp" value="138" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/component/persongroup/cmd/DeleteBatchScheduleCmd.java</url>
           <line>28</line>
           <option name="timeStamp" value="186" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java</url>
+          <url>file://$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/getclockInpoint/GetClockInPointCmd.java</url>
-          <line>62</line>
+          <line>54</line>
           <option name="timeStamp" value="189" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetClockInTimeListCmd.java</url>
+          <line>57</line>
+          <option name="timeStamp" value="190" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <watches-manager>

WEB-INF/sqllog/ecologysql

@@ -2823,3 +2823,443 @@
 	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
 	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
 "
+"2024-07-10","15:12:33.985","loginID=null main-1","53""1-369901249","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='4.60',ktsc='4.6',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='66',sxrq='2024-01-01',jqid='139',ztsc='0.0',qsrq='2024-05-01',yqsxrq='2024-12-31',yxsc='0.0',ffsj='2024-07-10 15:02:23',lyid='9',jzrq='2024-12-31' where 1=1 and id='639',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:475)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:30)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-10","16:37:58.232","loginID=null main-1","8""1-1060935276","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='4.60',ktsc='4.6',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='66',sxrq='2024-01-01',jqid='139',ztsc='0.0',qsrq='2024-05-01',yqsxrq='2024-12-31',yxsc='0.0',ffsj='2024-07-10 16:35:21',lyid='9',jzrq='2024-12-31' where 1=1 and id='639',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:505)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:34)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-11","19:16:30.945","loginID=null main-1","5""1-1622694817","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='5.00',ktsc='5.0',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='31',sxrq='2024-01-01',jqid='134',ztsc='0.0',qsrq='2023-05-03',yqsxrq='2024-12-31',yxsc='0.0',ffsj='2024-07-11 19:16:30',lyid='6',jzrq='2024-12-31' where 1=1 and id='634',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:533)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:35)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-11","19:18:05.252","loginID=null main-1","4""1-1731967318","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='5.00',ktsc='5.0',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='31',sxrq='2023-01-01',jqid='134',ztsc='0.0',qsrq='2023-05-03',yqsxrq='2023-12-31',yxsc='0.0',ffsj='2023-07-11',lyid='6',jzrq='2023-12-31' where 1=1 and id='641',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:533)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-11","19:18:53.387","loginID=null main-1","4""1-773238925","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='5.00',ktsc='5.0',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='31',sxrq='2023-01-01',jqid='134',ztsc='0.0',qsrq='2023-05-03',yqsxrq='2023-12-31',yxsc='0.0',ffsj='2023-07-11',lyid='6',jzrq='2023-12-31' where 1=1 and id='641',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:533)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-11","19:21:31.615","loginID=null main-1","5""1-1311544814","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='2.00',ktsc='5.0',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='31',sxrq='2024-01-01',jqid='134',ztsc='0.0',qsrq='2023-05-03',yqsxrq='2024-12-31',yxsc='3.0',ffsj='2024-07-11 19:20:31',lyid='6',jzrq='2024-12-31' where 1=1 and id='634',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:533)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-11","19:21:33.732","loginID=null main-1","5""1-1311544814","null","null","update","update uf_jcl_kq_jqye set wxsc=0 and yxsc=ktsc where id=?,[641]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:120)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:544)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-11","19:24:03.563","loginID=null main-1","5""1-1368173251","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='-1.00',ktsc='5.0',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='31',sxrq='2024-01-01',jqid='134',ztsc='0.0',qsrq='2023-05-03',yqsxrq='2024-12-31',yxsc='6.0',ffsj='2024-07-11 19:24:03',lyid='6',jzrq='2024-12-31' where 1=1 and id='634',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:533)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-11","19:24:03.579","loginID=null main-1","5""1-1368173251","null","null","update","update uf_jcl_kq_jqye set wxsc=0,yxsc=ktsc where id=?,[641]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:120)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:544)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-11","19:24:05.053","loginID=null main-1","4""1-1368173251","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='2.50',ktsc='5.0',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='81',sxrq='2024-01-01',jqid='134',ztsc='0.0',qsrq='2024-05-09',yqsxrq='2024-12-31',yxsc='2.5',ffsj='2024-07-11 19:24:04',lyid='6',jzrq='2024-12-31' where 1=1 and id='637',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:533)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"
+"2024-07-12","10:04:07.466","loginID=null main-1","5""1-1829217853","null","null","update","update uf_jcl_kq_jqye set zfsc='0.0',wxsc='-1.00',ktsc='5.0',jxsc='0.0',yqyxsc='0.00000',yqsc='0.00000',ygid='31',sxrq='2024-01-01',jqid='134',ztsc='0.0',qsrq='2023-05-03',yqsxrq='2024-12-31',yxsc='6.0',ffsj='2024-07-12 10:04:07',lyid='6',jzrq='2024-12-31' where 1=1 and id='634',[]",")
+	at weaver.conn.RecordSet.executeSql(RecordSet.java:1372)
+	at weaver.conn.RecordSet.executeUpdate(RecordSet.java:988)
+	at com.engine.jucailinkq.common.util.DbTools.update(DbTools.java:117)
+	at com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil.updateHolidayBalance(VocationCommonUtil.java:533)
+	at com.engine.jucailinkq.attendance.vacation.job.holidaygeneration.tactics.SinglePaymentInFullWay.compute(SinglePaymentInFullWay.java:204)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:83)
+	at com.engine.jucailinkq.attendance.vacation.cmd.VocationCmd.execute(VocationCmd.java:18)
+	at com.engine.core.interceptor.CommandInvoker.execute(CommandInvoker.java:38)
+	at com.engine.core.interceptor.CommandContextInterceptor.execute(CommandContextInterceptor.java:42)
+	at com.engine.core.interceptor.LogInterceptor.execute(LogInterceptor.java:19)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:37)
+	at com.engine.core.cfg.CommandExecutorImpl.execute(CommandExecutorImpl.java:42)
+	at com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl.generateVocation(VocationServiceImpl.java:76)
+	at vocation.Test1.test1(Test1.java:36)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:497)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
+	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
+	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
+	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
+	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
+	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
+	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
+	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
+	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
+	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
+	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
+	at com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs(JUnit4IdeaTestRunner.java:69)
+	at com.intellij.rt.junit.IdeaTestRunner$Repeater.startRunnerWithArgs(IdeaTestRunner.java:33)
+	at com.intellij.rt.junit.JUnitStarter.prepareStreamsAndStart(JUnitStarter.java:235)
+	at com.intellij.rt.junit.JUnitStarter.main(JUnitStarter.java:54)
+"

src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/GetScheduleResultListCmd.java

@@ -172,7 +172,13 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
             map.put("edxss",overtimePlan.get("jbsc"));
 
             map.put("jblx",overPlanattendanceItems);
-            map.put("gsrq", ClassBelongToEnum.NOWDAY.getKey());
+            if (DateUtil.getTime(overtimePlan.get("ksrq").toString()).compareTo(DateUtil.getTime(e.getKey())) < 0){
+                map.put("gsrq", ClassBelongToEnum.YESTERDAY.getKey());
+            }else if (DateUtil.getTime(overtimePlan.get("ksrq").toString()).compareTo(DateUtil.getTime(e.getKey())) == 0){
+                map.put("gsrq", ClassBelongToEnum.NOWDAY.getKey());
+            }else if (DateUtil.getTime(overtimePlan.get("ksrq").toString()).compareTo(DateUtil.getTime(e.getKey())) > 0){
+                map.put("gsrq", ClassBelongToEnum.NEXTDAY.getKey());
+            }
             if (overPlanattendanceItems.size() >0){
                 map.put("ksdk",overPlanattendanceItems.get(0).get("ksjbbxydk"));
                 map.put("jsdk",overPlanattendanceItems.get(0).get("jsjbbxydk"));
@@ -181,39 +187,27 @@ public class GetScheduleResultListCmd extends AbstractCommonCommand<Map<String,O
                 map.put("jbwdhlfzs",overPlanattendanceItems.get(0).get("jbwdhlfzs"));
                 map.put("jbzzhlfzs",overPlanattendanceItems.get(0).get("jbzzhlfzs"));
             }
-            if (resultList.size() > 1){
+            if (resultList.size() > 0){
                 String kssjbegin = Utils.getkssjTime(resultList.get(0),e.getKey());
                 String kssjend = Utils.getkssjTime(resultList.get(resultList.size()-1),e.getKey());
                 String kssj = overtimePlan.get("ksrq")+" "+overtimePlan.get("kssj");
                 if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(kssjbegin)) <0){
                     //加班计划在开头
-                    if (resultList.get(0).get("dtkssj").equals(overtimePlan.get("jssj")) &&
-                            resultList.get(0).get("ksdk").equals(CheckBoxEnum.CHECKED.getKey()) &&
-                            map.get("ksdk").equals(CheckBoxEnum.CHECKED.getKey()) &&
-                            map.get("jsdk").equals(CheckBoxEnum.CHECKED.getKey())){
-                        //当加班结束时间和早上打卡时间重合时
-
-                    }
                     resultList.add(0,map);
                 }else if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(kssjend)) >0){
                     //加班计划在末尾
-                    if (resultList.get(0).get("dtjssj").equals(overtimePlan.get("kssj")) &&
-                            resultList.get(0).get("jsdk").equals(CheckBoxEnum.CHECKED.getKey()) &&
-                            map.get("ksdk").equals(CheckBoxEnum.CHECKED.getKey()) &&
-                            map.get("jsdk").equals(CheckBoxEnum.CHECKED.getKey())){
-                        //当加班结束时间和晚上下班时间重合时1
-
-                    }
                     resultList.add(map);
                 }else {
-                    //加班计划在中间
+                    if (resultList.size() > 1){
-                    for (int j=1;j<resultList.size();j++){
+                        //加班计划在中间
-                        String kssj1 = Utils.getkssjTime(resultList.get(j),e.getKey());
+                        for (int j=1;j<resultList.size();j++){
-                        String kssj2 = overtimePlan.get("ksrq")+" "+overtimePlan.get("kssj");
+                            String kssj1 = Utils.getkssjTime(resultList.get(j),e.getKey());
-                        String kssj3 = Utils.getkssjTime(resultList.get(j-1),e.getKey());
+                            String kssj2 = overtimePlan.get("ksrq")+" "+overtimePlan.get("kssj");
-                        if (DateUtil.getTime(kssj1).compareTo(DateUtil.getTime(kssj2)) >=0 &&  DateUtil.getTime(kssj3).compareTo(DateUtil.getTime(kssj2)) <=0){
+                            String kssj3 = Utils.getkssjTime(resultList.get(j-1),e.getKey());
-                            resultList.add(j,map);
+                            if (DateUtil.getTime(kssj1).compareTo(DateUtil.getTime(kssj2)) >=0 &&  DateUtil.getTime(kssj3).compareTo(DateUtil.getTime(kssj2)) <=0){
-                            break;
+                                resultList.add(j,map);
+                                break;
+                            }
                         }
                     }
                 }

src/com/engine/jucailinkq/attendance/attendanceanalysis/cmd/workovertime/SaveWorkOverTimeCmd.java

@@ -10,17 +10,21 @@ import com.engine.jucailinkq.common.util.DateUtil;
 import com.engine.jucailinkq.common.util.DbTools;
 import com.engine.jucailinkq.common.util.Utils;
 import com.engine.core.interceptor.CommandContext;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import weaver.general.TimeUtil;
 import weaver.general.Util;
 
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * 根据相关设置控制加班时长，并入库
+ * 根据相关设置控制加班时长，并入库、加班转调休
  */
 @Slf4j
 public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object>> {
@@ -329,7 +333,14 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
      */
     public void updateholidayResult(String lyid,Map<String,Object> insertParam){
         double ktsc = Utils.convertDouble(insertParam.get("ktsc"));
+        String queryBeforeHolidaySql = "select id,yxsc,wxsc,ktsc,lyid from uf_jcl_kq_jqye where  ygid=? and jqid=?  order by jzrq desc, modedatacreatedate desc ,modedatacreatetime";
+        List<Map<String,Object>> beforeHolidayBalanceList = DbTools.getSqlToList(queryBeforeHolidaySql,insertParam.get("ygid"),insertParam.get("jqid"));
+        double beforewxsc = 0;
         if (!"".equals(lyid)) {
+            beforeHolidayBalanceList = beforeHolidayBalanceList.stream().filter(e->!e.get("lyid").equals(lyid)).collect(Collectors.toList());
+            if (beforeHolidayBalanceList.size() > 0 && Double.valueOf(beforeHolidayBalanceList.get(0).get("wxsc").toString()) <0){
+                beforewxsc = Double.valueOf(beforeHolidayBalanceList.get(0).get("wxsc").toString());
+            }
             String sql = "select yxsc,ztsc,zfsc,jxsc,yqsc,yqyxsc from uf_jcl_kq_jqye where lyid=?";
             List<Map<String,Object>> holidayList = DbTools.getSqlToList(sql,lyid);
             if (holidayList.size() > 0){
@@ -350,6 +361,10 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
             Utils.InsertFormTable("uf_jcl_kq_jqye",insertParam,(Map<String,String>)params.get("formmodeIdMap"));
         }else {
             if (ktsc !=0){
+                if (beforeHolidayBalanceList.size() > 0 && Double.valueOf(beforeHolidayBalanceList.get(0).get("wxsc").toString()) <0){
+                    beforewxsc = Double.valueOf(beforeHolidayBalanceList.get(0).get("wxsc").toString());
+                }
+
                 Utils.InsertFormTable("uf_jcl_kq_jqye",insertParam,(Map<String,String>)params.get("formmodeIdMap"));
             }
         }
@@ -368,4 +383,36 @@ public class SaveWorkOverTimeCmd extends AbstractCommonCommand<Map<String,Object
         }
     }
 
+    /**
+     * 处理透支余额
+     */
+    public void handleOverdraftHoliday(List<Map<String,Object>> beforeHolidayBalanceList,double beforewxsc,List<Map<String,Object>> dataList){
+
+        String updatesql = "update uf_jcl_kq_jqye set wxsc=0,yxsc=ktsc where id=?";
+
+        //上一笔假透支归0
+        DbTools.update(updatesql,beforeHolidayBalanceList.get(0).get("id"));
+        //修改请假申请明细的假期余额字段将透支的假改成当前的
+        String currentHolidayId = dataList.get(0).get("id").toString();
+
+        String beforeHolidayId = beforeHolidayBalanceList.get(0).get("id").toString();
+
+        String sql = "select id,glrq,sysc from uf_jcl_kq_qjjl_dt2 where jqye=? order by id desc";
+        List<Map<String,Object>> askforleaveList = DbTools.getSqlToList(sql,beforeHolidayId);
+        BigDecimal overdraftHoliday = new BigDecimal(String.valueOf(Math.abs(beforewxsc)));
+        List<String> ids = Lists.newArrayList();
+        for (Map<String,Object> askforleave:askforleaveList){
+            BigDecimal sysc = new BigDecimal(askforleave.get("sysc").toString());
+            overdraftHoliday = overdraftHoliday.subtract(sysc,new MathContext(2, RoundingMode.HALF_UP));
+            if (overdraftHoliday.doubleValue() >= 0){
+                ids.add(askforleave.get("id").toString());
+            }
+        }
+        log.info("need adjust askforleave detail2 data : [{}]",ids);
+        if (ids.size() > 0){
+            updatesql = "update uf_jcl_kq_qjjl_dt2 set jqye=? where id in ("+String.join(",",ids)+")";
+            DbTools.update(updatesql,currentHolidayId);
+        }
+    }
+
 }

src/com/engine/jucailinkq/attendance/attendanceanalysis/service/impl/ForgetClockInServiceImpl.java

@@ -80,7 +80,7 @@ public class ForgetClockInServiceImpl extends Service implements ForgetClockInSe
                 List<Map<String,Object>> missCardlist = needRecordMissCardList.stream().filter(e-> DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(e.get("pointTime").toString())) <=0 && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(e.get("pointTime").toString())) >=0).collect(Collectors.toList());
                 List<Map<String,Object>> abnormal = abnormalList.stream().filter(e-> DateUtil.getTime(dtkssj).compareTo(DateUtil.getTime(e.get("pointTime").toString())) <=0 && DateUtil.getTime(dtjssj).compareTo(DateUtil.getTime(e.get("pointTime").toString())) >=0).collect(Collectors.toList());
                 if (missCardlist.size() > 0){
-                    String edfzs = scheduleMap.get("edfzs").toString();
+                    String edfzs = Util.null2String(scheduleMap.get("edfzs")).equals("")?String.valueOf(Double.valueOf(scheduleMap.get("edxss").toString())*60):Util.null2String(scheduleMap.get("edfzs"));
                     lateParam.put("time",edfzs);
                     lateParam.put("workfor",Utils.getWorkFor(bdlx));
                     List<Map<String,Object>>  items = (List<Map<String,Object>>)commandExecutor.execute(new AbsenteeismItemCmd(lateParam)).get("attendanceItems");

src/com/engine/jucailinkq/attendance/attendanceanalysis/web/AttendanceanalysisAction.java

@@ -48,8 +48,8 @@ public class AttendanceanalysisAction {
         try {
             Map<String,Object> paramMap = ParamUtil.request2Map(request);
 //            Map<String,Object> paramMap = Maps.newHashMap();
-//            paramMap.put("startDate","2024-07-04");
+//            paramMap.put("startDate","2024-07-01");
-//            paramMap.put("endDate","2024-07-04");
+//            paramMap.put("endDate","2024-07-01");
 //            paramMap.put("userIds","81");
 
             String startDate = Util.null2String(paramMap.get("startDate"));

src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/ByIntervalPayMentWay.java

@@ -257,7 +257,7 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
         }
         insertHoliDayParam.put("ktsc", restTime);
 
-        VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,dataList);
+        VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,dataList,edyxq);
 
         return insertHoliDayParam;
     }
@@ -329,11 +329,11 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
                     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);
+                            double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc);
 
                             int afterDays = DateUtil.getBetWeenDays(divideTime,releaseDate.split(" ")[0])+1;
-                            double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
+                            double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc);
-                            restTime = beforeRestTime+afterRestTime;
+                            restTime = VocationCommonUtil.handleRestDays(beforeRestTime+afterRestTime,wscl);
                         }else {
                             int beforeDays = DateUtil.getBetWeenDays(qsrq,releaseDate.split(" ")[0])+1;
                             restTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
@@ -345,11 +345,11 @@ public class ByIntervalPayMentWay implements HolidayGenerationWay{
                 }else {
                     if (DateUtil.getTime(releaseDate).compareTo(DateUtil.getTime(divideTime)) >=0){
                         int beforeDays = DateUtil.getBetWeenDays(sxrq,divideTime);
-                        double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
+                        double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc);
 
                         int afterDays = DateUtil.getBetWeenDays(divideTime,releaseDate.split(" ")[0])+1;
-                        double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
+                        double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc);
-                        restTime = beforeRestTime+afterRestTime;
+                        restTime = VocationCommonUtil.handleRestDays(beforeRestTime+afterRestTime,wscl);
                     }else {
                         int beforeDays = DateUtil.getBetWeenDays(sxrq,releaseDate.split(" ")[0])+1;
                         restTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);

src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/BySchedulePaymentWay.java

@@ -175,7 +175,7 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
         }
         insertHoliDayParam.put("ktsc",restTime);
 
-        VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye",insertHoliDayParam,dataList);
+        VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye",insertHoliDayParam,dataList,edyxq);
 
         return insertHoliDayParam;
     }

src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.java

@@ -153,7 +153,7 @@ public class OneTimePayMentWay implements HolidayGenerationWay{
             restTime = ktsc;
         }
         insertHoliDayParam.put("ktsc", restTime);
-        VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,dataList);
+        VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,dataList,edyxq);
 
         return insertHoliDayParam;
     }

src/com/engine/jucailinkq/attendance/vacation/job/holidaygeneration/tactics/SinglePaymentInFullWay.java

@@ -201,7 +201,7 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
 
 
         if (!"1".equals(isOneTime)){
-            VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,dataList);
+            VocationCommonUtil.updateHolidayBalance("uf_jcl_kq_jqye", insertHoliDayParam,dataList,edyxq);
         }
         return insertHoliDayParam;
     }
@@ -259,9 +259,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
                         int beforeDays = DateUtil.getBetWeenDays(qsrq,divideTime);
                         int afterDays = DateUtil.getBetWeenDays(divideTime,nextSxrq);
 
-                        double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
+                        double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc);
-                        double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
+                        double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc);
-                        restTime = beforeRestTime+afterRestTime;
+                        restTime = VocationCommonUtil.handleRestDays(beforeRestTime+afterRestTime,wscl);
                     }else {
                         int afterDays = DateUtil.getBetWeenDays(qsrq,nextSxrq);
                         restTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
@@ -270,9 +270,9 @@ public class SinglePaymentInFullWay implements HolidayGenerationWay {
                 }else {
                     int beforeDays = DateUtil.getBetWeenDays(sxrq,divideTime);
                     int afterDays = DateUtil.getBetWeenDays(divideTime,nextSxrq);
-                    double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc, wscl);
+                    double beforeRestTime = VocationCommonUtil.computeRestDays(beforeDays, yearDays, beginEdktsc);
-                    double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc, wscl);
+                    double afterRestTime = VocationCommonUtil.computeRestDays(afterDays, yearDays, endEdktsc);
-                    restTime = beforeRestTime+afterRestTime;
+                    restTime = VocationCommonUtil.handleRestDays(beforeRestTime+afterRestTime,wscl);
                 }
             }
 

src/com/engine/jucailinkq/attendance/vacation/util/VocationCommonUtil.java

@@ -12,6 +12,8 @@ import weaver.general.TimeUtil;
 import weaver.general.Util;
 
 import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
@@ -260,6 +262,34 @@ public class VocationCommonUtil {
 
         return result;
     }
+    public static double computeRestDays(int day,int yearDay,double ratedRestTime){
+        BigDecimal dayBig = new BigDecimal(day);
+        BigDecimal yearDayBig = new BigDecimal(yearDay);
+        BigDecimal ratedRestTimeBig = new BigDecimal(ratedRestTime);
+        double result = dayBig.multiply(ratedRestTimeBig).divide(yearDayBig,6,BigDecimal.ROUND_HALF_UP).doubleValue();
+        return result;
+    }
+    public static double handleRestDays(double value,String wscl){
+        double result = 0;
+        if (RemainderHandleEnum.ROUND_UP_FOUR.getKey().equals(wscl)){
+            result = new BigDecimal(value,new MathContext(4, RoundingMode.HALF_UP)).doubleValue();
+        }else if (RemainderHandleEnum.ROUND_UP_TWO.getKey().equals(wscl)){
+            result = new BigDecimal(value,new MathContext(2, RoundingMode.HALF_UP)).doubleValue();
+        }else if (RemainderHandleEnum.DOWN_ZERO_POINT_FIVE.getKey().equals(wscl)){
+            result = new BigDecimal(value,new MathContext(2, RoundingMode.HALF_UP)).doubleValue();
+            result = Math.floor(result * 2) / 2;
+        }else if (RemainderHandleEnum.UP_ZERO_POINT_FIVE.getKey().equals(wscl)){
+            result = new BigDecimal(value,new MathContext(2, RoundingMode.HALF_UP)).doubleValue();
+            result = Math.ceil(result * 2) / 2;
+        }else if (RemainderHandleEnum.ROUND_DOWN.getKey().equals(wscl)){
+            result = new BigDecimal(value).setScale(0,BigDecimal.ROUND_DOWN).doubleValue();
+        }else if (RemainderHandleEnum.ROUND_UP.getKey().equals(wscl)){
+            result = new BigDecimal(value).setScale(0,BigDecimal.ROUND_UP).doubleValue();
+        }
+        return result;
+    }
+
+
 
     /**
      * 初始化插入假期余额参数
@@ -440,7 +470,7 @@ public class VocationCommonUtil {
      * @param tableName 假期余额表名
      * @param dataMap  参数
      */
-    public static void updateHolidayBalance(String tableName,Map<String,Object> dataMap,List<Map<String,Object>> dataList){
+    public static void updateHolidayBalance(String tableName,Map<String,Object> dataMap,List<Map<String,Object>> dataList,String edyxq){
         log.debug("updateHolidayBalance dataMap:[{}]",dataMap);
         String lyid = Util.null2String(dataMap.get("lyid"));
         String ygid = Util.null2String(dataMap.get("ygid"));
@@ -454,7 +484,32 @@ public class VocationCommonUtil {
         dataMap.put("jxsc",0);
         dataMap.put("yqsc",0);
         dataMap.put("yqyxsc",0);
+        //查询上一笔假期余额是否有透支情况
+        String queryBeforeHolidaySql = "select id,yxsc,wxsc,ktsc from uf_jcl_kq_jqye where  and ygid=? and jqid=? and sxrq=? and jzrq=? order by modedatacreatedate desc ,modedatacreatetime";
+        String beforeSxrq = "";
+        String beforeJzrq = "";
+        if (edyxq.equals(StartingUnitEnum.NATURAL_YEAR.getKey()) || edyxq.equals(StartingUnitEnum.STARTING_YEAR.getKey())){
+            beforeSxrq = DateUtil.beforeYear(sxrq,1,DateUtil.yyyyMMdd);
+            beforeJzrq = DateUtil.beforeYear(jzrq,1,DateUtil.yyyyMMdd);
+        }else if (edyxq.equals(StartingUnitEnum.NATURAL_MONTH.getKey()) || edyxq.equals(StartingUnitEnum.STARTING_MONTH.getKey())){
+            beforeSxrq = DateUtil.beforeMonth(sxrq,1);
+            beforeJzrq = DateUtil.beforeMonth(jzrq,1);
+        }else if (edyxq.equals(StartingUnitEnum.NATURAL_WEEK.getKey()) || edyxq.equals(StartingUnitEnum.STARTING_WEEK.getKey())){
+            beforeSxrq = DateUtil.beforeDay(sxrq,7);
+            beforeJzrq = DateUtil.beforeDay(jzrq,7);
+        }else if (edyxq.equals(StartingUnitEnum.NATURAL_DAY.getKey())){
+            beforeSxrq = DateUtil.beforeDay(sxrq,1);
+            beforeJzrq = DateUtil.beforeDay(jzrq,1);
+        }
+        List<Map<String,Object>> beforeHolidayBalanceList = DbTools.getSqlToList(queryBeforeHolidaySql,lyid,ygid,jqid,beforeSxrq,beforeJzrq);
+        double beforewxsc = 0;
+        String updatesql = "update uf_jcl_kq_jqye set wxsc=0,yxsc=ktsc where id=?";
+        if (beforeHolidayBalanceList.size() > 0 && Double.valueOf(beforeHolidayBalanceList.get(0).get("wxsc").toString()) <0){
+            //beforeHolidayBalanceList
+            beforewxsc = Double.valueOf(beforeHolidayBalanceList.get(0).get("wxsc").toString());
 
+        }
+        boolean excuteResult = false;
         if (dataList.size()>0){
             Map<String,Object> condition = Maps.newHashMap();
             condition.put("id",dataList.get(0).get("id"));
@@ -468,13 +523,46 @@ public class VocationCommonUtil {
             dataMap.put("jxsc",oldjxsc);
             dataMap.put("ztsc",oldztsc);
             dataMap.put("zfsc",oldzfsc);
-            dataMap.put("yxsc",oldyxsc);
             double wxsc = ktsc-oldztsc-oldzfsc-oldyxsc;
+            if (beforewxsc < 0){
+                wxsc = wxsc+beforewxsc;
+                oldyxsc = oldyxsc-beforewxsc;
+            }
+            dataMap.put("yxsc",oldyxsc);
             dataMap.put("wxsc",String.format ("%.2f",wxsc));
-
+            excuteResult = DbTools.update(CommonUtil.makeUpdateSql(tableName,dataMap,condition));
-            DbTools.update(CommonUtil.makeUpdateSql(tableName,dataMap,condition));
         }else {
-            Utils.InsertFormTable(tableName, dataMap, Utils.getFormmodeIdMap());
+            if (beforewxsc < 0){
+                dataMap.put("wxsc",Double.valueOf(dataMap.get("ktsc").toString())+beforewxsc);
+                dataMap.put("yxsc",0-beforewxsc);
+            }
+            excuteResult = Utils.InsertFormTable(tableName, dataMap, Utils.getFormmodeIdMap());
+            dataList = DbTools.getSqlToList(queryBeforeHolidaySql,lyid,ygid,jqid,dataMap.get("sxrq"),dataMap.get("jzrq"));
+        }
+        if (excuteResult && beforewxsc < 0){
+            //上一笔假透支归0
+            DbTools.update(updatesql,beforeHolidayBalanceList.get(0).get("id"));
+            //修改请假申请明细的假期余额字段将透支的假改成当前的
+            String currentHolidayId = dataList.get(0).get("id").toString();
+
+            String beforeHolidayId = beforeHolidayBalanceList.get(0).get("id").toString();
+
+            String sql = "select id,glrq,sysc from uf_jcl_kq_qjjl_dt2 where jqye=? order by id desc";
+            List<Map<String,Object>> askforleaveList = DbTools.getSqlToList(sql,beforeHolidayId);
+            BigDecimal overdraftHoliday = new BigDecimal(String.valueOf(Math.abs(beforewxsc)));
+            List<String> ids = Lists.newArrayList();
+            for (Map<String,Object> askforleave:askforleaveList){
+                BigDecimal sysc = new BigDecimal(askforleave.get("sysc").toString());
+                overdraftHoliday = overdraftHoliday.subtract(sysc,new MathContext(2, RoundingMode.HALF_UP));
+                if (overdraftHoliday.doubleValue() >= 0){
+                    ids.add(askforleave.get("id").toString());
+                }
+            }
+            log.info("need adjust askforleave detail2 data : [{}]",ids);
+            if (ids.size() > 0){
+                updatesql = "update uf_jcl_kq_qjjl_dt2 set jqye=? where id in ("+String.join(",",ids)+")";
+                DbTools.update(updatesql,currentHolidayId);
+            }
         }
 
     }

src/com/engine/jucailinkq/common/util/Utils.java

@@ -398,27 +398,27 @@ public class Utils<T> {
      */
     public static int removeTime(String kssj,String jssj,List<Map<String, Object>> scheduleResult,String analysisDate){
         int betweenMinutes = 0;
-        log.debug("removeRestTime  scheduleResult : {}",scheduleResult);
+        log.debug("removeTime  scheduleResult : {}",scheduleResult);
         for (Map<String, Object> restSchedule :scheduleResult){
             String dtkssj = Utils.getkssjTime(restSchedule,analysisDate);
             String dtjssj = Utils.getjssjTime(restSchedule,analysisDate);
 
             if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) <=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) >=0){
-                //休息时间在请假时间中间
+
                 betweenMinutes += DateUtil.getBetWeenMinutes(dtkssj,dtjssj);
-                log.debug("休息时间在请假时间中间");
+
             }else if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) <=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) <=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtkssj)) >=0){
                 //休息时间在请假时间 右边
                 betweenMinutes += DateUtil.getBetWeenMinutes(dtkssj,jssj);
-                log.debug("休息时间在请假时间 右边");
+
             }else if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) >=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) >=0 && DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtjssj)) <=0){
                 //休息时间在请假时间 左边
                 betweenMinutes += DateUtil.getBetWeenMinutes(kssj,dtjssj);
-                log.debug("休息时间在请假时间 左边");
+
             }else if (DateUtil.getTime(kssj).compareTo(DateUtil.getTime(dtkssj)) >=0 && DateUtil.getTime(jssj).compareTo(DateUtil.getTime(dtjssj)) <=0){
                 //请假时间在休息时间中间
                 betweenMinutes += DateUtil.getBetWeenMinutes(kssj,jssj);;
-                log.debug("请假时间在休息时间中间");
+
             }
         }
         return betweenMinutes;
@@ -582,7 +582,7 @@ public class Utils<T> {
      * @param dataMap
      * @param formmodeIdMap
      */
-    public static void InsertFormTable(String tableName,Map<String,Object> dataMap,Map<String,String> formmodeIdMap){
+    public static boolean InsertFormTable(String tableName,Map<String,Object> dataMap,Map<String,String> formmodeIdMap){
         String formmodeId = formmodeIdMap.get(tableName);
         dataMap.put("formmodeid",formmodeId);
         dataMap.put("modeuuid", UUID.randomUUID().toString());
@@ -590,15 +590,40 @@ public class Utils<T> {
         dataMap.put("modedatacreatertype","0");
         dataMap.put("modedatacreatedate",DateUtil.getCurrentTime().split(" ")[0]);
         dataMap.put("modedatacreatetime",DateUtil.getCurrentTime().split(" ")[1]);
-        CommonUtil.makeInsertSql(tableName,dataMap);
+        return CommonUtil.makeInsertSql(tableName,dataMap);
     }
 
     /**
      * 根据班段类型获得作用时段
+     * @param workFor
+     * @return
+     */
+    public static String getWorkFor(String workFor){
+        String bdlx="";
+        if (WorkForTimeEnum.WORK_TIME.getKey().equals(workFor)){
+            bdlx = ClassSegmentTypeEnum.WORK_TIME.getKey();
+        }else if (WorkForTimeEnum.DELAY_TO_WORK_OVERTIME.getKey().equals(workFor)){
+            bdlx = ClassSegmentTypeEnum.EXTENDED_OVERTIME.getKey();
+        }else if (WorkForTimeEnum.EARLY_TO_WORK_OVERTIME.getKey().equals(workFor)){
+            bdlx = ClassSegmentTypeEnum.EARLY_OVERTIME.getKey();
+        }else if (WorkForTimeEnum.PLAN_WORK_OVERTIME.getKey().equals(workFor)){
+            bdlx = ClassSegmentTypeEnum.OVERTIME_PLAN.getKey();
+        }else if (WorkForTimeEnum.LEAVE_TIME.getKey().equals(workFor)){
+            bdlx = ClassSegmentTypeEnum.ASK_FOR_LEAVE.getKey();
+        }else if (WorkForTimeEnum.EVECTION.getKey().equals(workFor)){
+            bdlx = ClassSegmentTypeEnum.EVECTION.getKey();
+        }else if (WorkForTimeEnum.OVERTIME_IN_CLASS.getKey().equals(workFor)){
+            bdlx = ClassSegmentTypeEnum.OVERTIME_IN_CLASS.getKey();
+        }
+        return bdlx;
+    }
+
+    /**
+     * 根据作用时段获得班段类型
      * @param bdlx
      * @return
      */
-    public static String getWorkFor(String bdlx){
+    public static String getClassSegmenByWorkFor(String bdlx){
         String workFor="";
         if (ClassSegmentTypeEnum.WORK_TIME.getKey().equals(bdlx)){
             workFor = WorkForTimeEnum.WORK_TIME.getKey();

test/vocation/Test1.java

@@ -4,6 +4,8 @@ import com.engine.jucailinkq.attendance.component.persongroup.commonutil.Persong
 import com.engine.jucailinkq.attendance.vacation.service.VocationService;
 import com.engine.jucailinkq.attendance.vacation.service.impl.VocationServiceImpl;
 import com.engine.common.util.ServiceUtil;
+import com.engine.jucailinkq.attendance.vacation.util.VocationCommonUtil;
+import com.engine.jucailinkq.common.util.DateUtil;
 import com.engine.jucailinkq.common.util.Utils;
 import com.engine.cube.service.ModeImpExpService;
 import com.engine.cube.service.impl.ModeImpExpServiceImpl;
@@ -12,6 +14,9 @@ import org.junit.Test;
 import weaver.hrm.User;
 import workflow.beforlog;
 
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
 import java.util.Map;
 
 public class Test1 extends beforlog {
@@ -25,6 +30,7 @@ public class Test1 extends beforlog {
         Map<String,String> formmodeIdMap = Utils.getFormmodeIdMap();
         String modeId = formmodeIdMap.get("uf_jcl_kq_jqed");
         params.put("modeId",modeId);
+//        params.put("releaseDate","2023-07-11");
 
         params.put("cover",1);
         basicsetService.generateVocation(params);
@@ -42,7 +48,11 @@ public class Test1 extends beforlog {
     }
     @Test
     public  void test3() throws Exception{
-        System.out.println(PersongroupCommonUtil.getClassesAndSimpleNameInformation().get("1").split("&")[2]);
+        BigDecimal overdraftHoliday = new BigDecimal(5.000);
+        BigDecimal overdraftHoliday2 = new BigDecimal(0.9000);
+        BigDecimal overdraftHoliday3 = new BigDecimal(0.1000);
+
+        System.out.println(overdraftHoliday.subtract(overdraftHoliday2,new MathContext(2, RoundingMode.HALF_UP)).subtract(overdraftHoliday3,new MathContext(2, RoundingMode.HALF_UP)).toString());
     }