|
|
|
@ -255,8 +255,8 @@ public class BySchedulePaymentWay implements HolidayGenerationWay{
|
|
|
|
|
|
|
|
|
|
//残年分割日期
|
|
|
|
|
divideTime = DateUtil.beforeMonth(qsrq,seniority);
|
|
|
|
|
divideTime = sxrq.split("-")[0] + "-" + divideTime.split("-")[1] + "-" + divideTime.split("-")[2];
|
|
|
|
|
divideTime = DateUtil.nextMonth(divideTime, 1, DateUtil.yyyyMM) + "-01";
|
|
|
|
|
//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);
|
|
|
|
|