|
@@ -287,7 +287,7 @@ public class PeriodCalculationUtil {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 3.2 处理首个周期
|
|
// 3.2 处理首个周期
|
|
|
- if (currLastDay != null && currLastDay.equals(periodBeginDate) == false) {
|
|
|
|
|
|
|
+ if (currLastDay != null) {
|
|
|
|
|
|
|
|
if(currLastDay.isAfter(periodEndDate))
|
|
if(currLastDay.isAfter(periodEndDate))
|
|
|
currLastDay=periodEndDate;
|
|
currLastDay=periodEndDate;
|