liuliang

.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Ч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

.idea/workspace.xml

@@ -16,11 +16,29 @@
       <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/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/HandleOverdueVocationCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/HandleOverdueVocationCmd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/vacation/util/VocationCommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/vacation/util/VocationCommonUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/attendanceanalysis/service/impl/AttendanceSummaryServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$4.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$5.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$5.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$6.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$6.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$7.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl$7.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/cmd/HandleOverdueVocationCmd.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/cmd/HandleOverdueVocationCmd.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/job/holidaygeneration/tactics/OneTimePayMentWay.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/vacation/util/VocationCommonUtil.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/action/askforleave/AskForLeaveWorkFlowSubmitAction.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/workflow/Test1.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/workflow/Test1.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/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" />
@@ -97,7 +115,7 @@
       <command value="organzationList" />
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.Test1.test3">
+  <component name="RunManager" selected="JUnit.Test1.test2">
     <configuration name="TestObj" type="Application" factoryName="Application" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="TestObj" />
       <module name="hrm-attendance" />
@@ -129,69 +147,69 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="Test1.test2 (1)" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="Test1.test2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="hrm-attendance" />
       <shortenClasspath name="MANIFEST" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="workflow.*" />
+          <option name="PATTERN" value="vocation.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="workflow" />
+      <option name="PACKAGE_NAME" value="vocation" />
-      <option name="MAIN_CLASS_NAME" value="workflow.Test1" />
+      <option name="MAIN_CLASS_NAME" value="vocation.Test1" />
       <option name="METHOD_NAME" value="test2" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="Test1.test3" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="Test1.test3 (1)" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="hrm-attendance" />
       <shortenClasspath name="MANIFEST" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="workflow.*" />
+          <option name="PATTERN" value="vocation.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="workflow" />
+      <option name="PACKAGE_NAME" value="vocation" />
-      <option name="MAIN_CLASS_NAME" value="workflow.Test1" />
+      <option name="MAIN_CLASS_NAME" value="vocation.Test1" />
       <option name="METHOD_NAME" value="test3" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestHandleOverdueVocation.test1" 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="vocation.*" />
+          <option name="PATTERN" value="workflow.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="vocation" />
+      <option name="PACKAGE_NAME" value="workflow" />
-      <option name="MAIN_CLASS_NAME" value="vocation.TestHandleOverdueVocation" />
+      <option name="MAIN_CLASS_NAME" value="workflow.Test1" />
-      <option name="METHOD_NAME" value="test1" />
+      <option name="METHOD_NAME" value="test3" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestgetDepartSchedule.test2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestHandleOverdueVocation.test1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="hrm-attendance" />
       <shortenClasspath name="MANIFEST" />
       <extension name="coverage">
         <pattern>
-          <option name="PATTERN" value="calendarscheduling.*" />
+          <option name="PATTERN" value="vocation.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
-      <option name="PACKAGE_NAME" value="calendarscheduling" />
+      <option name="PACKAGE_NAME" value="vocation" />
-      <option name="MAIN_CLASS_NAME" value="calendarscheduling.TestgetDepartSchedule" />
+      <option name="MAIN_CLASS_NAME" value="vocation.TestHandleOverdueVocation" />
-      <option name="METHOD_NAME" value="test2" />
+      <option name="METHOD_NAME" value="test1" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -206,11 +224,11 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.Test1.test3" />
+        <item itemvalue="JUnit.Test1.test2" />
+        <item itemvalue="JUnit.Test1.test3 (1)" />
         <item itemvalue="JUnit.Test1.test1" />
+        <item itemvalue="JUnit.Test1.test3" />
         <item itemvalue="JUnit.TestHandleOverdueVocation.test1" />
-        <item itemvalue="JUnit.TestgetDepartSchedule.test2" />
-        <item itemvalue="JUnit.Test1.test2 (1)" />
       </list>
     </recent_temporary>
   </component>
@@ -651,7 +669,10 @@
       <workItem from="1717140300551" duration="511000" />
       <workItem from="1717238328779" duration="73000" />
       <workItem from="1717380611211" duration="5128000" />
-      <workItem from="1717392850003" duration="2775000" />
+      <workItem from="1717392850003" duration="7014000" />
+      <workItem from="1717400027080" duration="8076000" />
+      <workItem from="1717464908378" duration="2433000" />
+      <workItem from="1717479367551" duration="594000" />
     </task>
     <servers />
   </component>
@@ -711,24 +732,9 @@
           <option name="timeStamp" value="122" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java</url>
+          <url>file://$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java</url>
-          <line>111</line>
+          <line>154</line>
-          <option name="timeStamp" value="123" />
+          <option name="timeStamp" value="138" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/test/vocation/Test1.java</url>
-          <line>28</line>
-          <option name="timeStamp" value="124" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/service/impl/VocationServiceImpl.java</url>
-          <line>36</line>
-          <option name="timeStamp" value="127" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/engine/attendance/vacation/cmd/VocationCmd.java</url>
-          <line>38</line>
-          <option name="timeStamp" value="128" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

src/com/engine/attendance/component/calendarscheduling/service/impl/WorkRulesServiceImpl.java

@@ -277,7 +277,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
         List<Map<String,Object>> cloumns = Lists.newArrayList();
         cloumns.add(new HashMap(){{
             put("title","编号");
-            put("width",100);
+            put("width",80);
             put("dataIndex","workcode");
             put("key","workcode");
             put("fixed","left");
@@ -285,7 +285,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
         }});
         cloumns.add(new HashMap(){{
             put("title","姓名");
-            put("width",100);
+            put("width",80);
             put("dataIndex","lastname");
             put("key","lastname");
             put("fixed","left");
@@ -293,7 +293,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
         }});
         cloumns.add(new HashMap(){{
             put("title","分部");
-            put("width",150);
+            put("width",80);
             put("dataIndex","subcompany");
             put("key","subcompany");
             put("fixed","left");
@@ -301,7 +301,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
         }});
         cloumns.add(new HashMap(){{
             put("title","部门");
-            put("width",150);
+            put("width",80);
             put("dataIndex","department");
             put("key","department");
             put("fixed","left");
@@ -313,7 +313,7 @@ public class WorkRulesServiceImpl extends Service implements WorkRulesService {
             map.put("title",i+1);
             map.put("dataIndex",DateUtil.AfterDay(startTime,i));
             map.put("key",i+1);
-            map.put("width",90);
+            map.put("width",80);
             map.put("isCalendar",0);
             cloumns.add(map);
         }

src/com/engine/attendance/vacation/cmd/HandleOverdueVocationCmd.java

@@ -35,7 +35,7 @@ public class HandleOverdueVocationCmd extends AbstractCommonCommand<Map<String,O
         if ("".equals(releaseDate)){
             releaseDate = DateUtil.getCurrentDate();
         }
-        String sql = "select a.id,a.jqid,a.ygid,a.wxsc,a.zfsc,a.sxrq,a.jzrq,a.yqsxrq,b.jb,b.jywxcl,b.yqsc,b.edkyqcs,b.yqhedzgxz from uf_jcl_kq_jqye a left join uf_jcl_kq_jqed b on a.jqid=b.jb where a.wxsc>0";
+        String sql = "select a.id,a.jqid,a.ygid,a.wxsc,a.zfsc,a.sxrq,a.jzrq,a.yqsxrq,b.jb,b.jywxcl,b.yqsc,b.edkyqcs,b.yqhedzgxz from  uf_jcl_kq_jqed b left join uf_jcl_kq_jqye a on a.lyid=b.id where a.wxsc>0";
         List<Map<String,Object>> holidayBalanceList =  DbTools.getSqlToList(sql);
 
         //需要作废的假期余额
@@ -93,7 +93,7 @@ public class HandleOverdueVocationCmd extends AbstractCommonCommand<Map<String,O
             double needExtendWxsc = wxsc;
             //需要作废的未休时长
             double needzfsc = zfsc;
-            if (havedHoliday != null && havedHoliday.size() > 0){
+            if (havedHoliday != null && havedHoliday.size() > 0 && DateUtil.getTime(finalyqsxrq).compareTo(DateUtil.getTime(releaseDate)) >=0){
                 double havedHolidayTime = havedHoliday.stream().mapToDouble(e->Utils.convertDouble(e.get("wxsc"))).sum();
                 if (havedHolidayTime+wxsc > yqhedzgxz){
                     needExtendWxsc=Utils.subtract(yqhedzgxz,havedHolidayTime);
@@ -103,7 +103,7 @@ public class HandleOverdueVocationCmd extends AbstractCommonCommand<Map<String,O
                     needzfsc = needzfsc+ Utils.subtract(wxsc,needExtendWxsc);
                 }
             }
-            String key = finalyqsxrq+"&"+wxsc+"&"+needzfsc;
+            String key = finalyqsxrq+"&"+needExtendWxsc+"&"+needzfsc;
             List<String> idList = updateData.get(key);
             if (idList == null){
                 idList = Lists.newArrayList();

src/com/engine/attendance/vacation/job/holidaygeneration/HolidayGenerationJob.java

@@ -34,6 +34,7 @@ public class HolidayGenerationJob extends BaseCronJob {
         params.put("releaseDate",executeDate);
         params.put("cover",cover);
         basicsetService.generateVocation(params);
+        basicsetService.handleOverdueVocation(params);
 
     }
 }

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

@@ -4,6 +4,7 @@ package com.engine.attendance.vacation.job.holidaygeneration.tactics;
 import com.engine.attendance.enums.StartingUnitEnum;
 import com.engine.attendance.vacation.util.VocationCommonUtil;
 import com.engine.common.util.DateUtil;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import weaver.general.TimeUtil;
 import weaver.general.Util;
@@ -41,6 +42,10 @@ public class OneTimePayMentWay implements HolidayGenerationWay{
         String edyj= Util.null2String(vocationList.get(0).get("edyj"));
         data.put("isOneTime","1");
 
+        if ("".equals(qsrq)){
+            return Maps.newHashMap();
+        }
+
         qsrq = VocationCommonUtil.getAfterAdjustTime(qsrq,dzqsrq,fgrq);
         for (Map<String, Object> vocationMap : vocationList) {
             vocationMap.put("qsrqValue", qsrq);
@@ -50,13 +55,8 @@ public class OneTimePayMentWay implements HolidayGenerationWay{
 
         Map<String, Object> insertHoliDayParam = Maps.newHashMap();
 
-        List<Map<String,Object>> dataList = VocationCommonUtil.ifexist("uf_jcl_kq_jqye", insertHoliDayParam);
+        List<Map<String,Object>> dataList = Lists.newArrayList();
 
-
-        //已存在数据且不覆盖
-        if (dataList.size()>0 && !"1".equals(cover)) {
-            return insertHoliDayParam;
-        }
         //实际休息时长
         double restTime = 0;
         SinglePaymentInFullWay singlePaymentInFullWay = new SinglePaymentInFullWay();
@@ -64,6 +64,12 @@ public class OneTimePayMentWay implements HolidayGenerationWay{
             Map<String, Object> maxMap = vocationList.stream().max(Comparator.comparing(e->Double.valueOf(e.get("jgsc1").toString()).intValue())).get();
             int maxjgsc1 = Double.valueOf(maxMap.get("jgsc1").toString()).intValue();
             insertHoliDayParam = getInsertHoliDayParam(vocationList.get(0), userId, qsrq, releaseDate,maxjgsc1);
+            dataList = VocationCommonUtil.ifexist("uf_jcl_kq_jqye", insertHoliDayParam);
+            //已存在数据且不覆盖
+            if (dataList.size()>0 && !"1".equals(cover)) {
+                return insertHoliDayParam;
+            }
+
             if (edyxq.equals(StartingUnitEnum.NATURAL_YEAR.getKey())){
                 //自然年
                 for (int i=0;i<=maxjgsc1;i++){
@@ -138,6 +144,11 @@ public class OneTimePayMentWay implements HolidayGenerationWay{
             }
         }else {
             insertHoliDayParam = singlePaymentInFullWay.compute(data);
+            dataList = VocationCommonUtil.ifexist("uf_jcl_kq_jqye", insertHoliDayParam);
+            //已存在数据且不覆盖
+            if (dataList.size()>0 && !"1".equals(cover)) {
+                return insertHoliDayParam;
+            }
             double ktsc = insertHoliDayParam.get("ktsc") == null?0:Double.valueOf(insertHoliDayParam.get("ktsc").toString());
             restTime = ktsc;
         }

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

@@ -174,6 +174,7 @@ public class VocationCommonUtil {
             }).collect(Collectors.toList());
         }else if (edyj.equals("1")){
             //选项值
+            if (!"".equals(yjzd)){
                 resultList = vocationList.stream().filter(e ->  {
                     //选项值
                     int xxz = Double.valueOf(Util.null2String(e.get("xxz"))).intValue();
@@ -184,6 +185,7 @@ public class VocationCommonUtil {
                     }
 
                 }).collect(Collectors.toList());
+            }
         }else if (edyj.equals("2")){
             //选项值+间隔时长
             resultList = vocationList.stream().filter(e ->  {

src/com/engine/common/util/DateUtil.java

@@ -153,9 +153,9 @@ public class DateUtil {
         YearMonth endYearMonth = YearMonth.from(endDate);
 
         int betweenMonth = (int) ChronoUnit.MONTHS.between(startYearMonth, endYearMonth);
-        if (startDate.getDayOfMonth()>endDate.getDayOfMonth()){
+//        if (startDate.getDayOfMonth()>endDate.getDayOfMonth()){
-            betweenMonth= betweenMonth-1;
+//            betweenMonth= betweenMonth-1;
-        }
+//        }
         return betweenMonth;
     }
 

test/vocation/Test1.java

@@ -2,6 +2,7 @@ package vocation;
 
 import com.engine.attendance.vacation.service.VocationService;
 import com.engine.attendance.vacation.service.impl.VocationServiceImpl;
+import com.engine.common.util.DateUtil;
 import com.engine.common.util.ServiceUtil;
 import com.engine.common.util.Utils;
 import com.engine.cube.service.ModeImpExpService;
@@ -31,8 +32,19 @@ public class Test1 extends beforlog {
     }
     @Test
     public  void test2() throws Exception{
-        System.out.println(new SubCompanyComInfo().getAllSupCompany("21"));
+        Map<String,Object> params = Maps.newHashMap();
+        Map<String,String> formmodeIdMap = Utils.getFormmodeIdMap();
+        String modeId = formmodeIdMap.get("uf_jcl_kq_jqed");
+        params.put("modeId",modeId);
 
+        params.put("cover",1);
+        basicsetService.handleOverdueVocation(params);
+
+    }
+    @Test
+    public  void test3() throws Exception{
+        System.out.println(DateUtil.nextMonth("2022-12-31",6,DateUtil.yyyyMMdd));
+        System.out.println(DateUtil.getBetWeenMonths("2022-12-31","2023-06-30"));
     }