diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values index 4eb285f..04ef7c5 100644 Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values differ diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s index 9b662de..61c4853 100644 --- a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s +++ b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s @@ -1 +1 @@ -y~|~~|}ƀ~}~|~}}}}~~}~}|}}qhjkjhjijkihlkopxutvvwv{xyxvxvyxzwvxې֐ߏ͎ڐΎڏČϐאˏčّݐޑяܐёގÑ̎ϏݏȔĐԏڎݍӐ̐ܓҏҎؐ˒͏Ѝ֐Џ̍ɑ͎͌ďې֎ɎߏΑ̏wssvswtsyltosqlqprlssusmoqrljZ\^\ZVZX\Vhwxzy{z|{xx|z|w{vy|VZUYSYX\Xace_WW^TRTTZW[T][WRWVZZUYQXWY[Zg~~z~{zy{x~|{~|}~}فad]h]a^a`a^_]]]^^^]]`kgggghc]Wkiqh \ No newline at end of file +y~|~~|}ƀ~}~|~}}}}~~}~}|}}qhjkjhjijkihlkopxutvvwv{xyxvxvyxzwvxې֐ߏ͎ڐΎڏČϐאˏčّݐޑяܐёގÑ̎ϏݏȔĐԏڎݍӐ̐ܓҏҎؐ˒͏Ѝ֐Џ̍ɑ͎͌ďې֎ɎߏΑ̏wssvswtsyltosqlqprlssusmoqrljZ\^\ZVZX\Vhwxzy{z|{xx|z|w{vy|VZUYSYX\Xace_WW^TRTTZW[T][WRWVZZUYQXWY[Zg~~z~{zy{x~|{~|}~}فad]h]a^a`a^_]]]^^^]]`kgggghc]WkiqhoLLLMMMMMMNMMMMMMMMMKKKKKJJJKKKLKKKKKKKKJJJKKKKKKKKKLKKKJJJKKKKLKKKKKKKKJIKKKKKKKKKKLKKJIJKKKKKLKKKKKKKJJJKKKKK \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 336398f..e74a762 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -10,104 +10,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -797,7 +710,7 @@ file://$PROJECT_DIR$/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java - 94 + 93 diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar index 8c688e5..30decbd 100644 Binary files a/out/artifacts/hrm_attendance/hrm-attendance.jar and b/out/artifacts/hrm_attendance/hrm-attendance.jar differ diff --git a/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java b/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java index 9818c10..bbd6a72 100644 --- a/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java +++ b/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java @@ -134,8 +134,8 @@ public class AskForLeaveWorkFlowSubmitAction implements Action { wxsc = 0; } else { detail2Map.put("sysc", leaveDuration); - leaveDuration = 0; wxsc = Utils.subtract(wxsc, leaveDuration); + leaveDuration = 0; } detailTable2.add(detail2Map); holidayBalance.put("wxsc", wxsc); diff --git a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class index 626f51f..c2d7442 100644 Binary files a/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class and b/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AbnormalAttendanceServiceImpl.class differ diff --git a/target/classes/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.class b/target/classes/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.class index 5f468a7..78cc3d1 100644 Binary files a/target/classes/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.class and b/target/classes/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.class differ diff --git a/target/classes/com/engine/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.class b/target/classes/com/engine/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.class index 738a317..67ff41a 100644 Binary files a/target/classes/com/engine/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.class and b/target/classes/com/engine/attendance/workflow/action/RevokeEliminationsAskForLeaveAction.class differ diff --git a/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowArchivingAction.class b/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowArchivingAction.class index 3f84618..d4c2d1a 100644 Binary files a/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowArchivingAction.class and b/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowArchivingAction.class differ diff --git a/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.class b/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.class index 345cb7a..391222b 100644 Binary files a/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.class and b/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.class differ