钉钉考勤
This commit is contained in:
@@ -71,12 +71,9 @@ public class AttendanceServiceImpl implements AttendanceService {
|
|||||||
|
|
||||||
ArrayList<Map<String, Object>> weekList = new ArrayList<>();
|
ArrayList<Map<String, Object>> weekList = new ArrayList<>();
|
||||||
DateTime dateTime = StrUtil.isBlank(endTime) ? DateUtil.date() : DateUtil.parse(endTime);
|
DateTime dateTime = StrUtil.isBlank(endTime) ? DateUtil.date() : DateUtil.parse(endTime);
|
||||||
for (int i = 7 * weekNum; i < 15 + 7 * weekNum; i++) {
|
for (int i = 7 * weekNum; i < 15 + 7 * weekNum; i++) {
|
||||||
DateTime date = DateUtil.offsetDay(dateTime, (15 - i + 1) * -1);
|
DateTime date = DateUtil.offsetDay(dateTime, (15 - i + 1) * -1);
|
||||||
String week = formatWeek(DateUtil.dayOfWeekEnum(date).toChinese());
|
String week = formatWeek(DateUtil.dayOfWeekEnum(date).toChinese());
|
||||||
if (date.compareTo(dateTime) < 0) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
weekList.add(new HashMap<>(){{
|
weekList.add(new HashMap<>(){{
|
||||||
put("week", week);
|
put("week", week);
|
||||||
put("date", date);
|
put("date", date);
|
||||||
|
|||||||
Reference in New Issue
Block a user