From a717925451e613067d8962b5fa0ba7d6c1f39e81 Mon Sep 17 00:00:00 2001 From: xyiege Date: Tue, 18 Oct 2022 17:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=80=E6=AC=A1=E6=80=A7?= =?UTF-8?q?=E6=89=98=E7=AE=A1=E7=BB=88=E6=AD=A2=E6=97=A5=E6=9C=9F=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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); // 节假日顺延后的日期