diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat
index 73af1bc..3989de5 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat differ
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�~��|��~�~��|�}ƀ
�~�}�~�|��~�}�}��
�}�}�~�~�}�~�}��|�}�}��
�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
\ No newline at end of file
+�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�o�L�L�L�M�M�M�M�M�M�N�M�M�M�M�M�M�M�M�M�K�K�K�K�K�J�J�J�K�K�K�L�K�K�K�K�K�K�K�K�J�J�J�K�K�K�K�K�K�K�K�K�L�K�K�K�J�J�J�K�K�K�K�L�K�K�K�K�K�K�K�K�J�I�K�K�K�K�K�K�K�K�K�K�L�K�K�J�I�J�K�K�K�K�K�L�K�K�K�K�K�K�K�J�J�J�K�K�K�K�K
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6202b81..bfa2b83 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -16,31 +16,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" />
       <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" 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/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/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/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/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$/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$/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$/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$/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$/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/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/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/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/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/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/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/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/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/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/vocation/Test1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/vocation/Test1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/vocation/Test1.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/vocation/Test1.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -744,7 +720,8 @@
       <workItem from="1720590109223" duration="14820000" />
       <workItem from="1720662652644" duration="4776000" />
       <workItem from="1720675844486" duration="17476000" />
-      <workItem from="1720747895355" duration="7141000" />
+      <workItem from="1720747895355" duration="7406000" />
+      <workItem from="1720756125339" duration="1646000" />
     </task>
     <servers />
   </component>
diff --git a/src/com/engine/jucailinkq/common/util/Utils.java b/src/com/engine/jucailinkq/common/util/Utils.java
index abe591e..6cfd2af 100644
--- a/src/com/engine/jucailinkq/common/util/Utils.java
+++ b/src/com/engine/jucailinkq/common/util/Utils.java
@@ -595,35 +595,10 @@ public class Utils<T> {
 
     /**
      * 根据班段类型获得作用时段
-     * @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 getClassSegmenByWorkFor(String bdlx){
+    public static String getWorkFor(String bdlx){
         String workFor="";
         if (ClassSegmentTypeEnum.WORK_TIME.getKey().equals(bdlx)){
             workFor = WorkForTimeEnum.WORK_TIME.getKey();
@@ -643,6 +618,31 @@ public class Utils<T> {
         return workFor;
     }
 
+    /**
+     * 根据作用时段获得班段类型
+     * @param workFor
+     * @return
+     */
+    public static String getClassSegmenByWorkFor(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 scheduleResult