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 abd3e3ec7..a9f88c6ca 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 @@ -67,14 +67,14 @@ public class AttendanceServiceImpl implements AttendanceService { @Override public Map detail(Long shopId, String userId, String startTime, String endTime, Integer weekNum) { - ArrayList listed = list(shopId, null, startTime, endTime, userId); + ArrayList listed = list(shopId, null, startTime, endTime, userId); ArrayList> weekList = new ArrayList<>(); 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, (15 - i) * -1); + DateTime date = DateUtil.offsetDay(dateTime, (15 - i + 1) * -1); String week = formatWeek(DateUtil.dayOfWeekEnum(date).toChinese()); - if (date.compareTo(DateUtil.parseDate(startTime)) < 0) { + if (date.compareTo(dateTime) < 0) { break; } weekList.add(new HashMap<>(){{