From 7d9fc1c64fe05198b2c658eba8b3762c4fa19431 Mon Sep 17 00:00:00 2001 From: xyiege Date: Wed, 19 Oct 2022 15:08:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=91=A8=E6=9C=9F=E6=89=98?= =?UTF-8?q?=E7=AE=A1=E6=97=B6=E9=97=B4=E8=A7=A3=E6=9E=90=E5=87=BA=E9=94=99?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/chjyj/szwh/service/impl/GoodsServiceImpl.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 fd72135..e53f38a 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -506,9 +506,6 @@ public class GoodsServiceImpl implements GoodsService { */ @Override public int manuImportGoods(JSONObject jsonObject) { - String host = ProperUtils.getSzwhProp("ENTRUST_URL"); - //创建签名 - String sign = SignUtils.createSign("entrust"); //处理json数据 return opGoodsInfo(jsonObject); } @@ -633,6 +630,8 @@ public class GoodsServiceImpl implements GoodsService { if (StringUtils.isBlank(cend)) { cend = "2099-12-31"; } + // 加上时间 + cend=cend+" 23:59:59"; //委托开始时间,取当前时间 Timestamp ncst = new Timestamp(System.currentTimeMillis()); //委托结束时间 default value 2099-12-31 23:59:59 @@ -646,11 +645,7 @@ public class GoodsServiceImpl implements GoodsService { ncst = new Timestamp(wtStart.getTime()); // 委托终止时间 Date wtEnd = WorkDayUtil.getWorkDay(wtStart, day); - // 统计该时间段内的节假日 - //int fdays = festivalsMapper.countDayBetweenDays(wtStart, wtEnd, iyear); - // 节假日顺延后的日期 - //Date fwtEnd = DateUtils.daysAgoOrAfter(wtEnd, fdays); - // 20221018 经咨询，不计算法定节假日的时长，故此暂作注释 + // 20221018 经咨询，不计算法定节假日的时长 Date fwtEnd = wtEnd; SimpleDateFormat ysdf = new SimpleDateFormat("yyyy-MM-dd"); cend = ysdf.format(fwtEnd) + " 23:59:59";