|
@@ -600,10 +600,12 @@ public class YearRequestForLeaveInfoServiceImpl implements YearRequestForLeaveIn
|
|
|
public boolean isHoliday(String startTime, String endTime) throws ParseException {
|
|
|
boolean result = false;
|
|
|
if (StringUtil.isNotEmpty(startTime)) {
|
|
|
+ String startTimeStr = startTime.substring(0,10);
|
|
|
+ String endTimeStr = endTime.substring(0,10);
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
|
|
|
- LocalDate startDate = LocalDate.parse(startTime);
|
|
|
- LocalDate endDate = LocalDate.parse(endTime);
|
|
|
+ LocalDate startDate = LocalDate.parse(startTimeStr);
|
|
|
+ LocalDate endDate = LocalDate.parse(endTimeStr);
|
|
|
|
|
|
//使用循环遍历日期
|
|
|
for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) {
|