diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java index 3534e38..334a59b 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -633,14 +633,8 @@ public class GoodsServiceImpl implements GoodsService { // 委托开始时间 匹配时间格式,防止转码出错 Date wtStart = sdf.parse(ncstart); ncst = new Timestamp(wtStart.getTime()); - // 判断周几 - calendar.setTime(wtStart); - int wkday = calendar.get(Calendar.DAY_OF_WEEK); - //周末顺延 - // notice:在节假日调休时候,会有变动 - day += wkday > 5 ? (wkday - 5 + 1) : 0; // 委托终止时间 - Date wtEnd = DateUtils.daysAgoOrAfter(wtStart, day); + Date wtEnd=WorkDayUtil.getWorkDay(wtStart,day); // 统计该时间段内的节假日 int fdays = festivalsMapper.countDayBetweenDays(wtStart, wtEnd, iyear); // 节假日顺延后的日期