From 7ddb19c2876812464e84f8542b9755058f508d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 1 Dec 2025 14:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=89=E9=92=89=E8=80=83=E5=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/market/service/impl/AttendanceServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java index ddd7929ea..18c227b3c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AttendanceServiceImpl.java @@ -69,8 +69,9 @@ public class AttendanceServiceImpl implements AttendanceService { public Map detail(Long shopId, String userId, String startTime, String endTime, Integer weekNum) { ArrayList listed = list(shopId, null, startTime, endTime, userId); + ArrayList> weekList = new ArrayList<>(); - DateTime dateTime = DateUtil.parse(endTime); + DateTime dateTime = StrUtil.isBlank(endTime) ? DateUtil.date() : DateUtil.parse(endTime); for (int i = 7 * weekNum; i < 15 + 7 * weekNum; i++) { DateTime date = DateUtil.offsetDay(dateTime, (weekNum - i) * -1); String week = formatWeek(DateUtil.dayOfWeekEnum(date).toChinese());