派假

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

@@ -254,9 +254,9 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
                 endYear = endYearMonth / 12;
 
                 //残年分割日期
-                divideTime = DateUtil.beforeMonth(qsrq, seniority);
-                divideTime = sxrq.split("-")[0] + "-" + divideTime.split("-")[1] + "-" + divideTime.split("-")[2];
-                divideTime = DateUtil.nextMonth(divideTime, 1, DateUtil.yyyyMM) + "-01";
+                divideTime = DateUtil.beforeMonth(qsrq,seniority);
+                //divideTime = sxrq.split("-")[0]+"-"+divideTime.split("-")[1]+"-"+divideTime.split("-")[2];
+                divideTime = DateUtil.nextYear(divideTime,endYear,DateUtil.yyyyMMdd);
             }
 
             Map<String,Object> beginYearmap = VocationCommonUtil.getVocationMap(vocationList, beginYear, yjzd,userId);